| commit | 5f9df8e7b478cafd4528a133201f4611a963292e | |
| author | Andreas Schwab <aschwab@redhat.com> | |
| Thu, 18 Jun 2009 13:49:56 +0000 (18 15:49 +0200) | ||
| committer | Andreas Schwab <aschwab@redhat.com> | |
| Thu, 18 Jun 2009 13:49:56 +0000 (18 15:49 +0200) | ||
| tree | 332931e9decd30c7a318c1fd3b8dd4bed629fcac | treesnapshot (tar.gz zip) |
| parent | ce6a278482f79dc52d0305e45de144d5e598568a | commitdiff |
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.
Use branch.$(my-branch).follow instead of branch.$(my-branch).merge to
record branch to follow and explicitly merge on make merge.
| fedora/Makefile | diffblobblamehistory |