summaryrefslogtreecommitdiff
path: root/debug
diff options
context:
space:
mode:
authorAndreas Schwab <aschwab@redhat.com>2009-06-18 15:49:56 +0200
committerAndreas Schwab <aschwab@redhat.com>2009-06-18 15:49:56 +0200
commit5f9df8e7b478cafd4528a133201f4611a963292e (patch)
tree332931e9decd30c7a318c1fd3b8dd4bed629fcac /debug
parentce6a278482f79dc52d0305e45de144d5e598568a (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 'debug')
0 files changed, 0 insertions, 0 deletions