summaryrefslogtreecommitdiff
path: root/t/t5307-pack-missing-commit.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-11-10 09:56:39 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-11-10 09:56:39 -0800
commit216d29ef257e48f95bc14765d5da17e7854a3109 (patch)
tree7cd0e31b75f442d9ae146f222b102b9982bd60ce /t/t5307-pack-missing-commit.sh
parenttrailer: display a trailer without its trailing newline (diff)
parentmerge & sequencer: turn "Conflicts:" hint into a comment (diff)
downloadtgif-216d29ef257e48f95bc14765d5da17e7854a3109.tar.xz
Merge branch 'jc/conflict-hint' into cc/interpret-trailers-more
* jc/conflict-hint: merge & sequencer: turn "Conflicts:" hint into a comment builtin/commit.c: extract ignore_non_trailer() helper function merge & sequencer: unify codepaths that write "Conflicts:" hint builtin/merge.c: drop a parameter that is never used git-tag.txt: Add a missing hyphen to `-s`
Diffstat (limited to 't/t5307-pack-missing-commit.sh')
0 files changed, 0 insertions, 0 deletions