Aggressive three-way merge: fix D/F case
[gitweb.git] / git-add--interactive.perl
2009-09-03 Merge branch 'maint-1.6.2' into maint-1.6.3
2009-09-03 Merge branch 'maint-1.6.2' into maint-1.6.3
2009-09-01 Merge branch 'mr/gitweb-snapshot'
2009-09-01 Merge branch 'tf/diff-whitespace-incomplete-line'
2009-08-29 Merge branch 'jk/maint-1.6.3-checkout-unborn'
2009-08-29 Merge branch 'np/maint-1.6.3-deepen'
2009-08-29 Merge branch 'jc/shortstatus'
2009-08-29 Merge branch 'rc/maint-http-fix' into maint
2009-08-28 Merge branch 'maint-1.6.2' into maint-1.6.3
2009-08-28 Merge branch 'maint-1.6.1' into maint-1.6.2
2009-08-28 Merge branch 'maint-1.5.6' into maint-1.6.0
2009-08-28 Merge branch 'lt/block-sha1'
2009-08-27 Merge branch 'as/maint-graph-interesting-fix'
2009-08-27 Merge branch 'jh/submodule-foreach'
2009-08-27 Merge branch 'jc/maint-unpack-objects-strict'
2009-08-27 Merge branch 'nd/sparse' (early part)
2009-08-26 Merge branch 'js/maint-cover-letter-non-ascii' into...
2009-08-26 Merge branch 'jc/maint-clean-nested-dir-safety' into...
2009-08-26 Merge branch 'jk/maint-merge-msg-fix' into maint
2009-08-26 Merge branch 'jc/apply-epoch-patch' into maint
2009-08-26 Merge branch 'jp/symlink-dirs' into maint
2009-08-26 Merge branch 'maint-1.6.3' into maint
2009-08-26 Merge branch 'tr/maint-1.6.3-add-p-modeonly-fix' into...
2009-08-25 Merge branch 'aj/fix-read-tree-from-scratch'
2009-08-25 Merge branch 'jc/maint-checkout-index-to-prefix'
2009-08-25 Merge branch 'jl/submodule-summary-diff-files'
2009-08-25 Merge branch 'lh/short-decorate'
2009-08-25 Merge branch 'oa/stash-na'
2009-08-24 Merge branch 'jc/verify-pack-stat'
2009-08-24 Merge branch 'mr/gitweb-xz'
2009-08-24 Merge branch 'ld/p4'
2009-08-22 Sync with 1.6.4.1
2009-08-22 Merge branch 'cc/replace'
2009-08-22 Merge branch 'gb/apply-ignore-whitespace'
2009-08-22 Merge branch 'bc/mailsplit-cr-at-eol'
2009-08-21 Merge branch 'jc/maint-merge-recursive-fix' into maint
2009-08-19 Merge branch 'rc/maint-http-fix'
2009-08-19 Merge branch 'tr/maint-1.6.3-add-p-modeonly-fix'
2009-08-16 Merge git://git.kernel.org/pub/scm/gitk/gitk
2009-08-15 Merge branch 'js/stash-dwim' into tr/reset-checkout...
2009-08-15 Implement 'git stash save --patch'
2009-08-15 Implement 'git checkout --patch'
2009-08-15 Implement 'git reset --patch'
2009-08-15 add -p: do not attempt to coalesce mode changes
2009-08-14 git-apply--interactive: Refactor patch mode code
2009-08-11 Merge branch 'jc/maint-merge-recursive-fix'
2009-08-08 Merge branch 'maint-1.6.2' into maint-1.6.3
2009-08-08 Merge branch 'maint-1.6.1' into maint-1.6.2
2009-07-29 Merge branch 'hv/cvsps-tests'
2009-07-06 Merge branch 'gb/am-foreign'
2009-07-02 Merge branch 'cc/bisect'
2009-07-02 Merge branch 'ne/maint-1.6.0-diff-tree-t-r-show-directory'
2009-06-22 Merge branch 'sb/maint-1.6.0-add-config-fix' into maint
2009-06-22 Merge branch 'ak/maint-for-each-ref-no-lookup' into...
2009-06-22 Merge branch 'rc/maint-http-local-slot-fix' into maint
2009-06-22 Merge branch 'cb/maint-no-double-merge' into maint
2009-06-22 Merge branch 'pb/maint-1.6.2-userdiff-fix' into maint
2009-06-21 Merge branch 'maint-1.6.2' into maint
2009-06-21 Merge branch 'maint-1.6.1' into maint-1.6.2
2009-06-21 Merge branch 'ph/submodule-rebase'
2009-06-21 Merge branch 'jc/cache-tree'
2009-06-21 Merge branch 'pb/maint-1.6.2-userdiff-fix'
2009-06-21 Merge branch 'sb/maint-1.6.0-add-config-fix'
2009-06-20 Merge git://git.kernel.org/pub/scm/gitk/gitk
2009-06-18 Merge branch 'ak/maint-for-each-ref-no-lookup'
2009-06-14 Merge branch 'maint-1.6.2' into maint
2009-06-14 Merge branch 'maint-1.6.1' into maint-1.6.2
2009-06-13 Merge branch 'rc/http-push'
2009-06-13 Merge branch 'cc/bisect' (early part)
2009-06-13 Merge branch 'rc/maint-http-local-slot-fix'
2009-06-13 Merge branch 'sp/msysgit'
2009-06-13 Merge branch 'cb/maint-no-double-merge'
2009-06-13 Merge branch 'ph/submodule-rebase' (early part)
2009-06-13 Merge branch 'bc/solaris'
2009-06-13 Merge branch 'cb/match_refs_internal_tail'
2009-06-13 Merge branch 'nw/maint-cvsexportcommit'
2009-06-13 Merge branch 'da/araxis-mergetool'
2009-06-11 Merge branch 'uk/maint-1.5.3-rebase-i-reflog' into...
2009-06-03 Merge branch 'da/pretty-tempname'
2009-06-03 Merge branch 'maint'
2009-06-03 add -i: do not dump patch during application
2009-06-02 Merge branch 'cb/maint-1.6.0-xdl-merge-fix' into maint
2009-06-02 Merge branch 'rs/maint-grep-word-regexp-fix' into maint
2009-06-02 Merge branch 'sb/maint-1.6.2-opt-filename-fix' into...
2009-06-02 Merge branch 'jc/maint-add-p-coalesce-fix' into maint
2009-05-31 Merge branch 'sb/opt-filename'
2009-05-31 Merge branch 'jc/solaris-0811'
2009-05-31 Merge branch 'sb/show-branch-parse-options'
2009-05-31 Merge branch 'mm/apply-double-slash'
2009-05-31 Merge branch 'sb/format-patch-parseopt'
2009-05-31 Merge branch 'jc/mktree'
2009-05-31 Merge branch 'mw/send-email'
2009-05-31 Merge branch 'cc/bisect' (early part)
2009-05-31 t9139 uses ancient, backwards-compatible iconv names
2009-05-31 Merge git://git.bogomips.org/git-svn
2009-05-29 Merge branch 'sb/maint-1.6.2-opt-filename-fix'
2009-05-29 Merge branch 'jc/maint-add-p-coalesce-fix'
2009-05-26 Merge branch 'js/maint-no-ln-across-libexec-and-bin...
2009-05-26 Merge branch 'lt/maint-diff-reduce-lstat' into maint
2009-05-26 Merge branch 'do/maint-merge-recursive-fix' into maint
next