]> git.ipfire.org Git - thirdparty/glibc.git/commit
projects / thirdparty / glibc.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 9d1b9fc) | patch
Don't automatically merge from followed branch on git pull.
authorAndreas Schwab <aschwab@redhat.com>
Thu, 18 Jun 2009 13:49:56 +0000 (15:49 +0200)
committerAndreas Schwab <aschwab@redhat.com>
Thu, 18 Jun 2009 14:01:13 +0000 (16:01 +0200)
commit6bdb5f22a0ee205c45d1f465a8b39179830a14cb
treee6b79da4346f3891f1193f304df0041a94b001c1tree
parent9d1b9fcafd89cae0d4010d22d5bbc8be69b59cd1commit | 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.
fedora/Makefile diff | blob | blame | history
A mirror of the official glibc repository