diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-07-13 21:22:12 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-07-13 21:22:12 -0700 |
| commit | 7bdb74868cf51245bce6ab033a1588e312e87310 (patch) | |
| tree | e4333aea5eae79bcf488916bd0a212e197f9a51b /git-merge-resolve.sh | |
| parent | Merge branch 'jk/push-delete-ref-error-message' (diff) | |
| parent | git p4: notice Jobs lines in git commit messages (diff) | |
| download | tgif-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 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions