summaryrefslogtreecommitdiff
path: root/xdiff-interface.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-07-13 21:22:12 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-07-13 21:22:12 -0700
commit7bdb74868cf51245bce6ab033a1588e312e87310 (patch)
treee4333aea5eae79bcf488916bd0a212e197f9a51b /xdiff-interface.h
parentMerge branch 'jk/push-delete-ref-error-message' (diff)
parentgit p4: notice Jobs lines in git commit messages (diff)
downloadtgif-7bdb74868cf51245bce6ab033a1588e312e87310.tar.xz
Merge branch 'pw/git-p4-jobs'
Teach "git p4" to notice "Jobs:" in the log message and relay it to Perforce to trigger its "jobs" support. # By Pete Wyckoff * pw/git-p4-jobs: git p4: notice Jobs lines in git commit messages git p4 test: refactor marshal_dump git p4: remove unused P4Submit interactive setting
Diffstat (limited to 'xdiff-interface.h')
0 files changed, 0 insertions, 0 deletions