summaryrefslogtreecommitdiff
path: root/builtin-log.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-08-16 04:13:04 -0700
committerJunio C Hamano <gitster@pobox.com>2009-08-16 04:13:04 -0700
commitb21f9e7f860620571667fba33ed511bed59dfb14 (patch)
tree1cb50257a9c0f179c88f81014064d079d5b416c8 /builtin-log.c
parent1d7d6ad539fabd49421d8ef7b27c0f287430bc7d (diff)
parent69a8b7c74192dfa7bde3937d2c84324a2cd1506b (diff)
downloadgit-b21f9e7f860620571667fba33ed511bed59dfb14.tar.gz
Merge branch 'jk/maint-merge-msg-fix'
* jk/maint-merge-msg-fix: merge: indicate remote tracking branches in merge message merge: fix incorrect merge message for ambiguous tag/branch add tests for merge message headings
Diffstat (limited to 'builtin-log.c')
0 files changed, 0 insertions, 0 deletions