merge-recursive: handle D/F conflict case more carefully.
[git] / Makefile
2007-04-09  Junio C HamanoMerge branch 'jc/push'
2007-04-09  Junio C HamanoMerge branch 'jc/merge-subtree'
2007-04-09  Junio C HamanoMerge branch 'js/fetch-progress'
2007-04-09  Junio C HamanoMerge branch 'maint'
2007-04-08  Junio C HamanoMerge branch 'jc/read-tree-df' (early part)
2007-04-08  Junio C HamanoMerge branch 'maint'
2007-04-07  Junio C HamanoA new merge stragety 'subtree'.
2007-04-07  Junio C HamanoMerge branch 'jc/index-output'
2007-04-07  Junio C HamanoMerge branch 'fp/make-j'
2007-04-07  Junio C HamanoMerge branch 'cc/bisect'
2007-04-07  Junio C HamanoMerge branch 'jc/checkout' (early part)
2007-04-07  Junio C HamanoMerge branch 'maint'
2007-04-07  Arjen LaarhovenMakefile: iconv() on Darwin has the old interface
2007-04-05  Junio C HamanoMerge branch 'maint'
2007-04-05  Fernando J. PeredaMakefile: Add '+' to QUIET_SUBDIR0 to fix parallel...
2007-04-05  Alex RiesenFix passing of TCLTK_PATH to git-gui
2007-04-05  Junio C HamanoFix dependency of common-cmds.h
2007-04-04  Junio C HamanoMerge branch 'jc/bisect'
2007-04-04  Junio C HamanoMerge branch 'fl/doc'
2007-04-04  Junio C HamanoMerge branch 'post1.5.1/blame.el'
2007-04-04  Junio C HamanoMerge branch 'post1.5.1/tcltk'
2007-04-04  Junio C HamanoMerge branch 'post1.5.1/p4'
2007-04-04  Junio C HamanoMerge 1.5.0.7 in
2007-04-01  Eygene RyabinkinRewrite Tcl/Tk interpreter path for the GUI tools.
2007-04-01  Eygene RyabinkinAdd --with-tcltk and --without-tcltk to configure.
2007-04-01  Eygene RyabinkinNO_TCLTK
2007-04-01  Eygene RyabinkinAdd the WITH_P4IMPORT knob to the Makefile.
2007-03-30  Junio C HamanoDo not bother documenting fetch--tool
2007-03-30  Junio C HamanoMerge branch 'maint'
2007-03-30  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git/mergetool.git
2007-03-28  Junio C HamanoMerge branch 'maint' to synchronize with 1.5.0.6
2007-03-27  Gerrit PapeMakefile: remove test-chmtime program in target clean.
2007-03-26  Junio C HamanoMerge branch 'jc/fpl'
2007-03-25  Junio C HamanoMerge branch 'maint'
2007-03-25  Junio C HamanoMerge branch 'maint'
2007-03-24  Junio C HamanoMerge branch 'maint'
2007-03-22  Junio C HamanoMerge git://git2.kernel.org/pub/scm/gitk/gitk
2007-03-22  Junio C HamanoMerge branch 'maint'
2007-03-20  Junio C HamanoMerge git://git2.kernel.org/pub/scm/gitk/gitk
2007-03-19  Junio C HamanoMerge branch 'jb/gc'
2007-03-19  Junio C HamanoMerge branch 'sp/run-command'
2007-03-18  Junio C HamanoMerge 1.5.0.5 in from 'maint'
2007-03-17  James BowesMake gc a builtin.
2007-03-17  Junio C HamanoMerge branch 'maint'
2007-03-14  Junio C HamanoMerge GIT 1.5.0.4
2007-03-14  Junio C HamanoMerge branch 'jc/repack'
2007-03-14  Junio C HamanoMerge branch 'jc/fetch'
2007-03-14  Junio C HamanoMerge branch 'dz/mailinfo'
2007-03-14  Junio C HamanoMerge branch 'jb/per-user-exclude'
2007-03-14  Junio C HamanoMerge branch 'maint'
2007-03-14  Junio C HamanoMerge branch 'pb/branch-track'
2007-03-14  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git/mergetool
2007-03-14  Theodore Ts'oAdd git-mergetool to run an appropriate merge conflict...
2007-03-13  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui
2007-03-13  Junio C HamanoMerge branch 'maint'
2007-03-13  Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git/fastimport...
2007-03-12  Shawn O. PearceMerge branch 'maint'
2007-03-12  Shawn O. PearceDon't package the git-gui credits file anymore
2007-03-12  Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into...
2007-03-12  Shawn O. PearceMerge branch 'maint' gitgui-0.6.5
2007-03-12  Shawn O. Pearcegit-gui: Revert "git-gui: Display all authors of git...
2007-03-12  Junio C HamanoMerge branch 'maint'
2007-03-12  Junio C HamanoMerge branch 'jc/boundary'
2007-03-11  Junio C HamanoMerge branch 'js/attach'
2007-03-11  Junio C HamanoMerge branch 'js/diff-ni'
2007-03-11  Junio C HamanoMerge branch 'jc/fsck'
2007-03-11  Junio C HamanoMerge branch 'pb/commit-i'
2007-03-11  Junio C HamanoMerge branch 'js/revert-cherry'
2007-03-11  Junio C HamanoMerge branch 'sp/make'
2007-03-11  Junio C HamanoMerge branch 'maint'
2007-03-07  Junio C HamanoMerge branch 'maint'
2007-03-07  Alex RiesenAllow "make -w" generate its usual output
2007-03-07  Alex RiesenSupport of "make -s": do not output anything of the...
2007-03-07  Alex RiesenMore build output cleaning up
2007-03-07  Alex Riesengit-gui: Support of "make -s" in: do not output anythin...
2007-03-06  Shawn O. PearceMake 'make' quiet by default
2007-03-06  Shawn O. PearceMake 'make' quieter while building git
2007-03-06  Junio C HamanoMerge branch 'maint'
2007-03-06  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui into...
2007-03-06  Shawn O. Pearcegit-gui: Make 'make' quieter by default gitgui-0.6.3
2007-03-06  Junio C HamanoMerge branch 'maint'
2007-03-06  Junio C HamanoMerge branch 'master-for-junio' of git://repo.or.cz...
2007-03-05  Shawn O. PearceMerge branch 'maint'
2007-03-05  Junio C HamanoMerge branch 'js/fetch-progress' (early part)
2007-03-05  Junio C HamanoMerge branch 'js/symlink'
2007-03-05  Junio C HamanoMerge branch 'maint'
2007-03-04  Johannes SchindelinMake git-revert & git-cherry-pick a builtin
2007-03-04  Junio C HamanoMerge branch 'js/diff-ni' (early part)
2007-03-04  Junio C HamanoMerge branch 'maint'
2007-03-04  Ramsay JonesUnset NO_C99_FORMAT on Cygwin.
2007-03-04  Ramsay JonesFix a "pointer type missmatch" warning.
2007-03-03  Junio C HamanoMerge branch 'maint'
2007-03-02  Junio C HamanoMerge branch 'js/commit-format'
2007-03-02  Junio C HamanoMerge branch 'maint'
2007-03-01  Johannes Schindelinfetch.o depends on the headers, too.
2007-02-28  Junio C HamanoMerge branch 'js/commit-by-name'
2007-02-28  Junio C HamanoMerge branch 'js/bundle'
2007-02-28  Junio C HamanoMerge branch 'maint'
2007-02-28  Junio C HamanoMerge branch 'mc/sendmail'
2007-02-28  Junio C HamanoMerge branch 'maint'
next