summaryrefslogtreecommitdiff
path: root/Documentation/git-fast-export.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2008-08-30 19:44:17 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-08-30 19:44:26 -0700
commit29a1f99b4b81cd28163de1275265234c5ab804b4 (patch)
tree8179b07340733b5e447b81117a9d82e651d8315c /Documentation/git-fast-export.txt
parentgit-merge-recursive: learn to honor merge.conflictstyle (diff)
parentcheckout --ours/--theirs: allow checking out one side of a conflicting merge (diff)
downloadtgif-29a1f99b4b81cd28163de1275265234c5ab804b4.tar.xz
Merge branch 'jc/maint-checkout-fix' into 'jc/better-conflict-resolution'
* jc/maint-checkout-fix: checkout --ours/--theirs: allow checking out one side of a conflicting merge checkout -f: allow ignoring unmerged paths when checking out of the index checkout: do not check out unmerged higher stages randomly
Diffstat (limited to 'Documentation/git-fast-export.txt')
0 files changed, 0 insertions, 0 deletions