merge: make function try_merge_command non static
[gitweb.git] / builtin /
2010-04-01 merge: make function try_merge_command non static
2010-04-01 merge: refactor code that calls "git merge-STRATEGY"
2010-04-01 revert: refactor merge recursive code into its own...
2010-04-01 revert: use strbuf to refactor the code that writes...
2010-03-21 cherry-pick, revert: add a label for ancestor
2010-03-21 revert: clarify label on conflict hunks
2010-03-21 checkout -m --conflict=diff3: add a label for ancestor
2010-03-21 checkout --conflict=diff3: add a label for ancestor
2010-03-21 ll_merge(): add ancestor label parameter for diff3...
2010-03-21 merge-file --diff3: add a label for ancestor
2010-03-21 xdl_merge(): move file1 and file2 labels to xmparam...
2010-03-20 Merge branch 'jk/maint-add-ignored-dir'
2010-03-20 Merge branch 'ml/color-grep'
2010-03-20 Merge branch 'jc/color-attrs'
2010-03-20 Merge branch 'cc/reset-keep'
2010-03-20 Merge branch 'fl/askpass'
2010-03-20 Merge branch 'bg/apply-fix-blank-at-eof'
2010-03-20 Merge branch 'bw/union-merge-refactor'
2010-03-20 Merge branch 'maint'
2010-03-17 Merge branch 'maint'
2010-03-17 Merge branch 'maint'
2010-03-15 Merge branch 'sd/format-patch-to'
2010-03-15 Merge branch 'tc/http-cleanup'
2010-03-15 Merge branch 'tc/transport-verbosity'
2010-03-15 Merge branch 'ld/push-porcelain'
2010-03-15 Merge branch 'jh/notes'
2010-03-14 Merge branch 'maint'
2010-03-13 Merge branch 'maint'
2010-03-10 Merge branch 'sd/init-template'
2010-03-10 Merge branch 'sh/am-keep-cr'
2010-03-10 Merge branch 'cp/add-u-pathspec'
2010-03-10 Merge branch 'lt/deepen-builtin-source'
2010-02-22 Move 'builtin-*' into a 'builtin/' subdirectory