summaryrefslogtreecommitdiff
path: root/git-rebase--merge.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-06-25 11:47:09 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-06-25 11:47:09 -0700
commit11aae3e1c17bca8e7057d99a071815ee3c526d16 (patch)
tree171c65aac1ac30c1a0b9f65c83a18cf221de02ed /git-rebase--merge.sh
parentMerge branch 'jk/commit-C-pick-empty' into maint (diff)
parentrun_diff_files: do not look at uninitialized stat data (diff)
downloadtgif-11aae3e1c17bca8e7057d99a071815ee3c526d16.tar.xz
Merge branch 'jk/diff-files-assume-unchanged' into maint
"git diff --find-copies-harder" sometimes pretended as if the mode bits have changed for paths that are marked with assume-unchanged bit. * jk/diff-files-assume-unchanged: run_diff_files: do not look at uninitialized stat data
Diffstat (limited to 'git-rebase--merge.sh')
0 files changed, 0 insertions, 0 deletions