Aggressive three-way merge: fix D/F case
[gitweb.git] / git-add--interactive.perl
2009-05-26 Merge branch 'jk/maint-1.6.0-trace-argv' into maint
2009-05-25 Merge branch 'master' into sb/opt-filename
2009-05-24 Merge branch 'maint-1.6.2' into maint
2009-05-24 Merge branch 'maint-1.6.1' into maint-1.6.2
2009-05-23 Merge branch 'mg/track'
2009-05-23 Merge branch 'js/maint-no-ln-across-libexec-and-bin'
2009-05-23 Merge branch 'lt/maint-diff-reduce-lstat'
2009-05-23 Merge branch 'do/maint-merge-recursive-fix'
2009-05-23 Merge branch 'jk/maint-1.6.0-trace-argv'
2009-05-18 Merge branch 'js/add-edit'
2009-05-18 Merge branch 'ac/graph-horizontal-line'
2009-05-18 Merge branch 'ae/anon-fetch-info'
2009-05-17 Revert "git-add--interactive: remove hunk coalescing"
2009-05-16 Merge branch 'maint-1.6.2' into maint
2009-05-14 Merge branch 'maint-1.6.1' into maint-1.6.2
2009-05-12 Merge branch 'maint-1.6.2' into maint
2009-05-12 Merge branch 'jc/maint-read-tree-multi' into maint...
2009-05-09 Merge branch 'maint-1.6.1' into maint-1.6.2
2009-05-06 Merge branch 'maint'
2009-05-06 Merge branch 'rj/maint-1.6.0-svn-parse-fix' into maint
2009-05-06 Merge branch 'maint-1.6.0' into maint
2009-05-03 Sync with GIT 1.6.2.5
2009-05-03 Merge branch 'np/maint-no-ofs-delta' into maint
2009-05-03 Merge branch 'maint-1.6.1' into maint
2009-05-03 Merge branch 'jc/maint-read-tree-multi' into maint
2009-05-03 Merge branch 'mk/maint-apply-swap' into maint
2009-05-03 Merge branch 'mm/maint-add-p-quit' into maint
2009-05-03 Merge branch 'lt/pack-object-memuse' into maint
2009-05-03 Merge branch 'jc/maint-1.6.0-diff-borrow-carefully...
2009-05-02 Merge git://repo.or.cz/git-gui
2009-05-01 Merge git://git.kernel.org/pub/scm/gitk/gitk
2009-04-29 Merge branch 'maint'
2009-04-29 Merge branch 'maint-1.6.1' into maint
2009-04-28 Merge branch 'maint'
2009-04-28 Merge branch 'maint-1.6.1' into maint
2009-04-25 Merge branch 'maint'
2009-04-25 Merge branch 'maint-1.6.1' into maint
2009-04-23 Merge branch 'jc/maint-read-tree-multi'
2009-04-21 Merge branch 'mk/maint-apply-swap'
2009-04-21 Merge branch 'maint'
2009-04-20 Merge branch 'mm/maint-add-p-quit'
2009-04-20 git add -p: add missing "q" to patch prompt
2009-04-20 Sync with 1.6.2.4
2009-04-19 Merge branch 'ef/maint-fast-export' into maint
2009-04-19 Merge branch 'mm/maint-add-p-quit' into maint
2009-04-19 add-interactive: refactor mode hunk handling
2009-04-19 git add -p: new "quit" command at the prompt.
2009-04-18 Merge branch 'lt/bool-on-off'
2009-04-18 Merge branch 'lt/pack-object-memuse'
2009-04-18 Merge branch 'nd/archive-attribute'
2009-04-18 Merge branch 'maint'
2009-04-18 Merge branch 'maint-1.6.1' into maint
2009-04-18 Merge branch 'bs/maint-1.6.0-tree-walk-prefix' into...
2009-04-18 Merge branch 'maint-1.6.0' into maint
2009-04-18 Merge branch 'ac/color-graph'
2009-04-18 Merge branch 'jk/cobdoc'
2009-04-18 Merge branch 'mk/apply-swap'
2009-04-18 Merge branch 'mm/add-p-quit'
2009-04-18 Merge branch 'maint'
2009-04-18 Merge branch 'maint-1.6.1' into maint
2009-04-16 add-interactive: refactor mode hunk handling
2009-04-16 git add -p: new "quit" command at the prompt.
2009-04-13 Mark t1301 permission test to depend on POSIXPERM
2009-04-12 Merge branch 'maint'
2009-04-12 Merge branch 'maint-1.6.1' into maint
2009-04-09 Merge branch 'maint'
2009-04-09 Merge branch 'jc/maint-1.6.0-diff-borrow-carefully...
2009-04-09 Merge branch 'maint-1.6.1' into maint
2009-04-09 Merge branch 'jc/maint-1.6.0-keep-pack' into maint
2009-04-09 Merge branch 'jc/maint-1.6.0-blame-s' into maint-1.6.1
2009-04-08 Merge branch 'maint'
2009-04-08 Merge branch 'maint-1.6.1' into maint
2009-04-08 Merge branch 'bs/maint-1.6.0-tree-walk-prefix'
2009-04-08 Merge branch 'js/maint-submodule-checkout'
2009-04-08 Merge branch 'cb/maint-merge-recursive-submodule-fix'
2009-04-06 Merge branch 'jc/shared-literally'
2009-04-05 Merge branch 'maint'
2009-04-05 Merge branch 'maint-1.6.1' into maint
2009-04-02 Sync with 1.6.2.2
2009-04-02 Merge branch 'jc/maint-1.6.0-blame-s' into maint
2009-04-02 Merge branch 'js/maint-diff-temp-smudge' into maint
2009-04-02 Merge branch 'js/maint-1.6.0-exec-path-env' into maint
2009-04-02 Merge branch 'bc/maint-1.6.1-branch-deleted-was' into...
2009-04-02 Merge branch 'tr/maint-1.6.1-doc-format-patch--root...
2009-04-02 Merge branch 'tr/maint-1.6.1-doc-format-patch--root'
2009-04-02 Merge branch 'maint'
2009-04-02 Merge branch 'maint-1.6.1' into maint
2009-04-02 Merge branch 'jc/maint-1.6.0-keep-pack'
2009-04-02 Merge branch 'kb/tracking-count-no-merges'
2009-03-30 Merge branch 'maint'
2009-03-30 Merge branch 'maint-1.6.1' into maint
2009-03-30 Merge branch 'maint'
2009-03-30 Merge branch 'maint-1.6.1' into maint
2009-03-28 Merge branch 'maint'
2009-03-28 Merge branch 'jc/maint-1.6.0-diff-borrow-carefully'
2009-03-28 Merge branch 'js/remote-improvements'
2009-03-28 Merge branch 'jk/clone-post-checkout'
2009-03-28 Merge branch 'maint-1.6.1' into maint
2009-03-27 Merge branch 'db/push-cleanup'
2009-03-26 Merge branch 'maint'
next