projects / git / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
Makefile: test-parse-options depends on parse-options.h
[git] / merge-recursive.c
2009-06-02  Junio C HamanoMerge branch 'cb/maint-1.6.0-xdl-merge-fix' into maint blob | commitdiff | raw
2009-06-02  Junio C HamanoMerge branch 'rs/maint-grep-word-regexp-fix' into maint blob | commitdiff | raw
2009-06-02  Junio C HamanoMerge branch 'sb/maint-1.6.2-opt-filename-fix' into... blob | commitdiff | raw
2009-06-02  Junio C HamanoMerge branch 'jc/maint-add-p-coalesce-fix' into maint blob | commitdiff | raw
2009-05-31  Junio C HamanoMerge branch 'jc/solaris-0811' blob | commitdiff | raw
2009-05-31  Junio C HamanoMerge branch 'sb/show-branch-parse-options' blob | commitdiff | raw
2009-05-31  Junio C HamanoMerge branch 'sb/format-patch-parseopt' blob | commitdiff | raw
2009-05-31  Junio C HamanoMerge branch 'jc/mktree' blob | commitdiff | raw
2009-05-31  Junio C HamanoMerge branch 'mw/send-email' blob | commitdiff | raw
2009-05-31  Junio C HamanoMerge branch 'cc/bisect' (early part) blob | commitdiff | raw
2009-05-31  Eric Wongt9139 uses ancient, backwards-compatible iconv names blob | commitdiff | raw
2009-05-29  Junio C HamanoMerge branch 'sb/maint-1.6.2-opt-filename-fix' blob | commitdiff | raw
2009-05-29  Junio C HamanoMerge branch 'jc/maint-add-p-coalesce-fix' blob | commitdiff | raw
2009-05-29  Junio C HamanoMerge branch 'rs/maint-grep-word-regexp-fix' blob | commitdiff | raw
2009-05-26  Junio C HamanoMerge branch 'js/maint-no-ln-across-libexec-and-bin... blob | commitdiff | raw
2009-05-26  Junio C HamanoMerge branch 'lt/maint-diff-reduce-lstat' into maint blob | commitdiff | raw
2009-05-26  Junio C HamanoMerge branch 'jm/format-patch-no-auto-n-when-k-is-given... blob | commitdiff | raw
2009-05-26  Junio C HamanoMerge branch 'do/maint-merge-recursive-fix' into maint blob | commitdiff | raw
2009-05-26  Junio C HamanoMerge branch 'jk/maint-1.6.0-trace-argv' into maint blob | commitdiff | raw | diff to current
2009-05-25  Junio C HamanoMerge branch 'jc/mktree' into sb/opt-filename blob | commitdiff | raw
2009-05-25  Junio C HamanoMerge branch 'sb/format-patch-parseopt' into sb/opt... blob | commitdiff | raw
2009-05-25  Junio C HamanoMerge branch 'sb/show-branch-parse-options' into sb... blob | commitdiff | raw
2009-05-25  Junio C HamanoMerge branch 'master' into sb/opt-filename blob | commitdiff | raw
2009-05-24  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw
2009-05-24  Junio C HamanoMerge branch 'maint-1.6.2' into maint blob | commitdiff | raw | diff to current
2009-05-24  Junio C HamanoMerge branch 'maint-1.6.1' into maint-1.6.2 blob | commitdiff | raw | diff to current
2009-05-24  Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1 blob | commitdiff | raw | diff to current
2009-05-23  Junio C HamanoMerge branch 'jn/gitweb-cleanup' blob | commitdiff | raw
2009-05-23  Junio C HamanoMerge branch 'mg/track' blob | commitdiff | raw
2009-05-23  Junio C HamanoMerge branch 'fc/decorate-tag' blob | commitdiff | raw
2009-05-23  Junio C HamanoMerge branch 'tp/send-email-from-config' blob | commitdiff | raw
2009-05-23  Junio C HamanoMerge branch 'js/maint-no-ln-across-libexec-and-bin' blob | commitdiff | raw
2009-05-23  Junio C HamanoMerge branch 'da/mergetool-lib' blob | commitdiff | raw
2009-05-23  Junio C HamanoMerge branch 'cc/bisect' (early part) blob | commitdiff | raw
2009-05-23  Junio C HamanoMerge branch 'lt/maint-diff-reduce-lstat' blob | commitdiff | raw
2009-05-23  Junio C HamanoMerge branch 'jm/format-patch-no-auto-n-when-k-is-given' blob | commitdiff | raw
2009-05-23  Junio C HamanoMerge branch 'do/maint-merge-recursive-fix' blob | commitdiff | raw
2009-05-23  Junio C HamanoMerge branch 'jk/maint-1.6.0-trace-argv' blob | commitdiff | raw | diff to current
2009-05-23  Junio C HamanoMerge branch 'mh/show-branch-color' into sb/show-branch... blob | commitdiff | raw | diff to current
2009-05-18  Junio C HamanoMerge branch 'js/add-edit' blob | commitdiff | raw | diff to current
2009-05-18  Junio C HamanoMerge branch 'mh/diff-stat-color' blob | commitdiff | raw | diff to current
2009-05-18  Junio C HamanoMerge branch 'mh/show-branch-color' blob | commitdiff | raw | diff to current
2009-05-18  Junio C HamanoMerge branch 'ac/graph-horizontal-line' blob | commitdiff | raw | diff to current
2009-05-18  Junio C HamanoMerge branch 'ae/anon-fetch-info' blob | commitdiff | raw | diff to current
2009-05-16  Junio C HamanoMerge branch 'maint-1.6.2' into maint blob | commitdiff | raw | diff to current
2009-05-14  Junio C HamanoMerge branch 'maint-1.6.1' into maint-1.6.2 blob | commitdiff | raw | diff to current
2009-05-14  Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1 blob | commitdiff | raw | diff to current
2009-05-12  Junio C HamanoMerge branch 'maint-1.6.2' into maint blob | commitdiff | raw | diff to current
2009-05-10  Dave Olszewskimerge-recursive: never leave index unmerged while recursing blob | commitdiff | raw | diff to current
2009-05-09  Junio C HamanoMerge branch 'maint-1.6.1' into maint-1.6.2 blob | commitdiff | raw | diff to current
2009-05-09  Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1 blob | commitdiff | raw | diff to current
2009-05-06  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2009-05-06  Junio C HamanoMerge branch 'rj/maint-1.6.0-svn-parse-fix' into maint blob | commitdiff | raw | diff to current
2009-05-06  Junio C HamanoMerge branch 'maint-1.6.0' into maint blob | commitdiff | raw | diff to current
2009-05-03  Junio C HamanoSync with GIT 1.6.2.5 blob | commitdiff | raw | diff to current
2009-05-03  Junio C HamanoMerge branch 'maint-1.6.1' into maint blob | commitdiff | raw | diff to current
2009-05-03  Junio C HamanoMerge branch 'mm/maint-add-p-quit' into maint blob | commitdiff | raw | diff to current
2009-05-03  Junio C HamanoMerge branch 'lt/pack-object-memuse' into maint blob | commitdiff | raw | diff to current
2009-05-03  Junio C HamanoMerge branch 'jc/maint-1.6.0-keep-pack' into maint... blob | commitdiff | raw | diff to current
2009-05-03  Junio C HamanoMerge branch 'jc/maint-1.6.0-diff-borrow-carefully... blob | commitdiff | raw | diff to current
2009-05-03  Junio C HamanoMerge branch 'bs/maint-1.6.0-tree-walk-prefix' into... blob | commitdiff | raw | diff to current
2009-05-02  Junio C HamanoMerge git://repo.or.cz/git-gui blob | commitdiff | raw | diff to current
2009-05-01  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
2009-04-29  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2009-04-29  Junio C Hamanomerge-recursive: do not die on a conflicting submodule blob | commitdiff | raw | diff to current
2009-04-29  Junio C HamanoMerge branch 'maint-1.6.1' into maint blob | commitdiff | raw | diff to current
2009-04-29  Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1 blob | commitdiff | raw | diff to current
2009-04-28  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2009-04-28  Junio C HamanoMerge branch 'maint-1.6.1' into maint blob | commitdiff | raw | diff to current
2009-04-28  Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1 blob | commitdiff | raw | diff to current
2009-04-25  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2009-04-25  Junio C HamanoMerge branch 'maint-1.6.1' into maint blob | commitdiff | raw | diff to current
2009-04-25  Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1 blob | commitdiff | raw | diff to current
2009-04-23  Junio C HamanoMerge branch 'jc/maint-read-tree-multi' blob | commitdiff | raw | diff to current
2009-04-21  Junio C HamanoMerge branch 'mk/maint-apply-swap' blob | commitdiff | raw | diff to current
2009-04-21  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2009-04-20  Junio C HamanoMerge branch 'mm/maint-add-p-quit' blob | commitdiff | raw | diff to current
2009-04-20  Junio C HamanoSync with 1.6.2.4 blob | commitdiff | raw | diff to current
2009-04-19  Junio C HamanoMerge branch 'ef/maint-fast-export' into maint blob | commitdiff | raw | diff to current
2009-04-19  Junio C HamanoMerge branch 'mm/maint-add-p-quit' into maint blob | commitdiff | raw | diff to current
2009-04-19  Junio C HamanoMerge branch 'lt/maint-reflog-expire' into maint blob | commitdiff | raw | diff to current
2009-04-19  Junio C HamanoMerge branch 'jc/maint-shared-literally' into maint blob | commitdiff | raw | diff to current
2009-04-18  Junio C HamanoMerge branch 'lt/pack-object-memuse' blob | commitdiff | raw | diff to current
2009-04-18  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2009-04-18  Junio C HamanoMerge branch 'maint-1.6.1' into maint blob | commitdiff | raw | diff to current
2009-04-18  Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1 blob | commitdiff | raw | diff to current
2009-04-18  Junio C HamanoMerge branch 'bs/maint-1.6.0-tree-walk-prefix' into... blob | commitdiff | raw | diff to current
2009-04-18  Junio C HamanoMerge branch 'js/maint-submodule-checkout' into maint blob | commitdiff | raw | diff to current
2009-04-18  Junio C HamanoMerge branch 'cb/maint-merge-recursive-submodule-fix... blob | commitdiff | raw | diff to current
2009-04-18  Junio C HamanoMerge branch 'maint-1.6.0' into maint blob | commitdiff | raw | diff to current
2009-04-18  Junio C HamanoMerge branch 'da/difftool' blob | commitdiff | raw | diff to current
2009-04-18  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2009-04-18  Junio C HamanoMerge branch 'maint-1.6.1' into maint blob | commitdiff | raw | diff to current
2009-04-18  Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1 blob | commitdiff | raw | diff to current
2009-04-13  Junio C HamanoMark t1301 permission test to depend on POSIXPERM blob | commitdiff | raw | diff to current
2009-04-12  Junio C HamanoMerge branch 'sb/doc-upstream-branch' blob | commitdiff | raw | diff to current
2009-04-12  Junio C HamanoMerge branch 'jk/show-upstream' blob | commitdiff | raw | diff to current
2009-04-12  Junio C HamanoMerge branch 'fg/remote-prune' blob | commitdiff | raw | diff to current
2009-04-12  Junio C HamanoMerge branch 'cc/sha1-bsearch' blob | commitdiff | raw | diff to current
2009-04-12  Junio C HamanoMerge branch 'cc/bisect-filter' blob | commitdiff | raw | diff to current
next
Unnamed repository; edit this file 'description' to name the repository.