summaryrefslogtreecommitdiff
path: root/git-merge-one-file.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-11-03 15:13:09 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-11-03 15:13:10 -0800
commit6784eb5ad93da15d24a5d111a3d6df618f98532f (patch)
tree1c0311803176e831745024d632c146dd21a9808e /git-merge-one-file.sh
parentMerge branch 'rs/wt-status-detached-branch-fix' (diff)
parentblame: allow blame --reverse --first-parent when it makes sense (diff)
downloadtgif-6784eb5ad93da15d24a5d111a3d6df618f98532f.tar.xz
Merge branch 'mk/blame-first-parent'
"git blame" learnt to take "--first-parent" and "--reverse" at the same time when it makes sense. * mk/blame-first-parent: blame: allow blame --reverse --first-parent when it makes sense blame: extract find_single_final blame: test to describe use of blame --reverse --first-parent
Diffstat (limited to 'git-merge-one-file.sh')
0 files changed, 0 insertions, 0 deletions