summaryrefslogtreecommitdiff
path: root/t/t4013/diff.diff-tree_--pretty=oneline_--patch-with-raw_initial
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-12-09 13:37:09 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-12-09 13:37:09 -0800
commiteb8aa3d2c2849cb3a44396b89054339df38e2bfa (patch)
tree7af351487a380753f89376e78a9c860378d28bfb /t/t4013/diff.diff-tree_--pretty=oneline_--patch-with-raw_initial
parentMerge branch 'jc/request-pull-show-head-4' (diff)
parentcommit-tree: teach -m/-F options to read logs from elsewhere (diff)
downloadtgif-eb8aa3d2c2849cb3a44396b89054339df38e2bfa.tar.xz
Merge branch 'jc/pull-signed-tag'
* jc/pull-signed-tag: commit-tree: teach -m/-F options to read logs from elsewhere commit-tree: update the command line parsing commit: teach --amend to carry forward extra headers merge: force edit and no-ff mode when merging a tag object commit: copy merged signed tags to headers of merge commit merge: record tag objects without peeling in MERGE_HEAD merge: make usage of commit->util more extensible fmt-merge-msg: Add contents of merged tag in the merge message fmt-merge-msg: package options into a structure fmt-merge-msg: avoid early returns refs DWIMmery: use the same rule for both "git fetch" and others fetch: allow "git fetch $there v1.0" to fetch a tag merge: notice local merging of tags and keep it unwrapped fetch: do not store peeled tag object names in FETCH_HEAD Split GPG interface into its own helper library Conflicts: builtin/fmt-merge-msg.c builtin/merge.c
Diffstat (limited to 't/t4013/diff.diff-tree_--pretty=oneline_--patch-with-raw_initial')
0 files changed, 0 insertions, 0 deletions