summaryrefslogtreecommitdiff
path: root/git-reset.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-02-04 06:04:14 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-02-07 05:43:27 (GMT)
commit1b1fdf8c2f935e2195d3ca5c37e578bd9146a82f (patch)
tree908d448f476257bbc49d9c56debfd65d43d5ac52 /git-reset.sh
parent8bc5c04a715ee0746df2bcd7e0924f4119140ad2 (diff)
downloadgit-1b1fdf8c2f935e2195d3ca5c37e578bd9146a82f.zip
git-1b1fdf8c2f935e2195d3ca5c37e578bd9146a82f.tar.gz
git-1b1fdf8c2f935e2195d3ca5c37e578bd9146a82f.tar.bz2
read-tree --aggressive
A new flag --aggressive resolves what we traditionally resolved with external git-merge-one-file inside index while read-tree 3-way merge works. git-merge-octopus and git-merge-resolve use this flag before running git-merge-index with git-merge-one-file. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-reset.sh')
0 files changed, 0 insertions, 0 deletions