summaryrefslogtreecommitdiff
path: root/git-pull.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-12-02 18:30:12 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-12-02 18:30:12 (GMT)
commit0748494e866041034605aaf177f29a61bdc25951 (patch)
treee48f6c091a7231ae0db5d643215df16c5bd7a8d9 /git-pull.sh
parentc86485dd15d54fc6ff2cd0dda3b2a9faa4f2d66e (diff)
parent28044baba6d268d91057398ffa041ee1b931a5e0 (diff)
downloadgit-0748494e866041034605aaf177f29a61bdc25951.zip
git-0748494e866041034605aaf177f29a61bdc25951.tar.gz
git-0748494e866041034605aaf177f29a61bdc25951.tar.bz2
Merge branch 'maint'
* maint: Prepare for 1.6.5.4 merge: do not add standard message when message is given with -m option Do not misidentify "git merge foo HEAD" as an old-style invocation Conflicts: RelNotes
Diffstat (limited to 'git-pull.sh')
0 files changed, 0 insertions, 0 deletions