Add custom memory allocator to MinGW and MacOS builds
[gitweb.git] / git-merge-one-file.sh
2009-05-31 Merge branch 'mw/send-email'
2009-05-31 Merge branch 'cc/bisect' (early part)
2009-05-29 Merge branch 'sb/maint-1.6.2-opt-filename-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 'jm/format-patch-no-auto-n-when-k-is-given...
2009-05-26 Merge branch 'do/maint-merge-recursive-fix' into maint
2009-05-26 Merge branch 'jk/maint-1.6.0-trace-argv' into maint
2009-05-26 Merge branch 'np/push-delta' into maint
2009-05-26 Merge branch 'ar/unlink-err' 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-23 Merge branch 'mg/track'
2009-05-23 Merge branch 'fc/decorate-tag'
2009-05-23 Merge branch 'tp/send-email-from-config'
2009-05-23 Merge branch 'js/maint-no-ln-across-libexec-and-bin'
2009-05-23 Merge branch 'da/mergetool-lib'
2009-05-23 Merge branch 'cc/bisect' (early part)
2009-05-23 Merge branch 'lt/maint-diff-reduce-lstat'
2009-05-23 Merge branch 'jm/format-patch-no-auto-n-when-k-is-given'
2009-05-23 Merge branch 'do/maint-merge-recursive-fix'
2009-05-23 Merge branch 'rr/forbid-bs-in-ref'
2009-05-23 Merge branch 'hv/sample-update'
2009-05-23 Merge branch 'jk/maint-1.6.0-trace-argv'
2009-05-23 Merge branch 'jk/no-no-no-empty-directory'
2009-05-23 Merge branch 'rs/grep-parseopt'
2009-05-23 Merge branch 'fl/git-pm'
2009-05-23 Merge branch 'mt/submodule-reference'
2009-05-23 Merge branch 'mh/show-branch-color' into sb/show-branch...
2009-05-18 Merge branch 'np/push-delta'
2009-05-18 Merge branch 'ar/unlink-err'
2009-05-18 Merge branch 'js/add-edit'
2009-05-18 Merge branch 'mh/diff-stat-color'
2009-05-18 Merge branch 'mh/show-branch-color'
2009-05-18 Merge branch 'ac/graph-horizontal-line'
2009-05-18 Merge branch 'ae/anon-fetch-info'
2009-05-16 Merge branch 'maint-1.6.2' into maint
2009-05-12 Merge branch 'maint-1.6.2' into maint
2009-05-09 Merge branch 'maint'
2009-05-09 Clarify kind of conflict in merge-one-file helper
2009-05-02 Merge git://repo.or.cz/git-gui
2009-05-01 Merge git://git.kernel.org/pub/scm/gitk/gitk
2009-04-30 Clarify kind of conflict in merge-one-file helper
2009-03-02 Merge git://git.kernel.org/pub/scm/gitk/gitk
2009-02-11 Merge branch 'maint-1.5.4' into maint-1.5.5
2008-12-22 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-12-18 Merge git://repo.or.cz/git-gui
2008-12-17 GIT 1.5.5.6 v1.5.5.6
2008-12-02 Merge git://repo.or.cz/git-gui
2008-12-02 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-12-01 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-12-01 Merge git://repo.or.cz/git-gui
2008-11-16 Merge git://repo.or.cz/git-gui
2008-11-13 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-11-13 Merge git://repo.or.cz/git-gui
2008-11-02 Merge git://repo.or.cz/git-gui
2008-11-02 Merge branch 'maint' of git://repo.or.cz/git-gui into...
2008-10-21 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-09-25 Merge git://repo.or.cz/git-gui
2008-09-07 Merge updated git-gui and gitk that call each other
2008-09-06 Merge branch 'maint' of git://repo.or.cz/git-gui into...
2008-08-17 Merge git-gui 0.11.0
2008-08-17 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-08-06 Merge git://repo.or.cz/git-gui
2008-08-06 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-07-30 Merge git://repo.or.cz/git-gui
2008-07-27 Merge git://repo.or.cz/git-gui
2008-07-15 Merge git://repo.or.cz/git-gui
2008-07-06 Merge git://repo.or.cz/git-gui
2008-06-27 Merge branch 'maint-1.5.4' into maint-1.5.5
2008-06-11 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-05-27 Merge git://repo.or.cz/git-gui
2008-05-26 Merge branch 'maint-1.5.4' into maint
2008-05-24 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-05-23 Merge branch 'maint-1.5.4' into maint v1.5.5.2
2008-05-21 Merge branch 'maint-1.5.4' into maint
2008-05-15 Merge git://repo.or.cz/git-gui
2008-05-15 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-05-14 Merge branch 'maint-1.5.4' into maint
2008-05-11 Merge branch 'maint-1.5.4' into maint
2008-05-09 Merge branch 'maint-1.5.4' into maint
2008-05-04 Merge branch 'maint-1.5.4' into maint
2008-04-30 Merge branch 'maint-1.5.4' into maint
2008-04-28 Merge branch 'maint-1.5.4' into maint
2008-04-25 Merge branch 'maint-1.5.4' into maint
2008-04-23 Merge branch 'maint-1.5.4' into maint
2008-04-19 Merge branch 'maint-1.5.4' into maint
2008-04-17 Merge branch 'maint-1.5.4' into maint
2008-04-16 Merge branch 'maint-1.5.4' into maint
2008-04-12 Merge branch 'maint-1.5.4' into maint
2008-04-12 Merge branch 'maint-1.5.4' into maint
2008-04-10 Merge branch 'maint-1.5.4' into maint
2008-04-09 Merge branch 'jc/rename'
2008-04-09 Merge branch 'mk/unpack-careful'
2008-04-09 Merge branch 'fl/send-email-outside'
2008-04-09 Merge branch 'jc/rebase'
2008-04-08 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-04-07 Merge branch 'jc/maint-apply-match-beginning'
2008-04-05 Merge git://repo.or.cz/git-gui
2008-04-02 Merge git://repo.or.cz/git-gui
next