diff options
| author | Andreas Schwab <aschwab@redhat.com> | 2009-06-18 15:49:56 +0200 |
|---|---|---|
| committer | Andreas Schwab <aschwab@redhat.com> | 2009-06-18 15:49:56 +0200 |
| commit | 5f9df8e7b478cafd4528a133201f4611a963292e (patch) | |
| tree | 332931e9decd30c7a318c1fd3b8dd4bed629fcac /libio | |
| parent | ce6a278482f79dc52d0305e45de144d5e598568a (diff) | |
| download | glibc-5f9df8e7b478cafd4528a133201f4611a963292e.tar.gz glibc-5f9df8e7b478cafd4528a133201f4611a963292e.tar.xz glibc-5f9df8e7b478cafd4528a133201f4611a963292e.zip | |
Don't automatically merge from followed branch on git pull.
Use branch.$(my-branch).follow instead of branch.$(my-branch).merge to record branch to follow and explicitly merge on make merge.
Diffstat (limited to 'libio')
0 files changed, 0 insertions, 0 deletions