diff options
| author | Andreas Schwab <aschwab@redhat.com> | 2009-06-18 15:49:56 +0200 |
|---|---|---|
| committer | Andreas Schwab <aschwab@redhat.com> | 2009-06-18 16:01:13 +0200 |
| commit | 6bdb5f22a0ee205c45d1f465a8b39179830a14cb (patch) | |
| tree | e6b79da4346f3891f1193f304df0041a94b001c1 /sysdeps/unix/sysv/linux/accept4.c | |
| parent | 9d1b9fcafd89cae0d4010d22d5bbc8be69b59cd1 (diff) | |
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 'sysdeps/unix/sysv/linux/accept4.c')
0 files changed, 0 insertions, 0 deletions