projects / git.git / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
Use __VA_ARGS__ for all of error's arguments
[git.git] / merge.c
2012-12-13 Junio C HamanoMerge branch 'maint' blob | commitdiff | raw
2012-12-12 Junio C HamanoMerge branch 'so/prompt-command' blob | commitdiff | raw
2012-12-11 Junio C HamanoMerge branch 'ef/mingw-rmdir' blob | commitdiff | raw
2012-12-11 Junio C HamanoMerge branch 'maint' blob | commitdiff | raw
2012-12-10 Junio C HamanoSync with 1.8.0.2 blob | commitdiff | raw
2012-12-07 Junio C HamanoMerge branch 'maint' blob | commitdiff | raw
2012-12-04 Junio C HamanoMerge branch 'mm/status-push-pull-advise' blob | commitdiff | raw
2012-12-03 Junio C HamanoMerge branch 'mm/status-push-pull-advise' blob | commitdiff | raw
2012-11-29 Junio C HamanoMerge branch 'lt/diff-stat-show-0-lines' blob | commitdiff | raw
2012-11-29 Junio C HamanoMerge branch 'fc/remote-hg' blob | commitdiff | raw
2012-11-29 Junio C HamanoMerge branch 'mk/complete-tcsh' blob | commitdiff | raw
2012-11-29 Junio C HamanoMerge branch 'jc/doc-push-satellite' blob | commitdiff | raw
2012-11-29 Junio C HamanoMerge branch 'jl/submodule-rm' blob | commitdiff | raw
2012-11-29 Junio C HamanoMerge branch 'pp/gitweb-config-underscore' blob | commitdiff | raw
2012-11-29 Junio C HamanoMerge branch 'fc/completion-test-simplification' blob | commitdiff | raw
2012-11-29 Junio C HamanoMerge branch 'maint' blob | commitdiff | raw
2012-11-28 Junio C HamanoMerge branch 'maint' blob | commitdiff | raw
2012-11-28 Junio C HamanoMerge branch 'mm/status-push-pull-advise' blob | commitdiff | raw
2012-11-28 Junio C HamanoMerge branch 'jk/pickaxe-textconv' blob | commitdiff | raw
2012-11-27 Junio C HamanoMerge branch 'maint' blob | commitdiff | raw
2012-11-26 Junio C HamanoMerge branch 'maint' blob | commitdiff | raw
2012-11-26 Junio C HamanoMerge branch 'rr/submodule-diff-config' blob | commitdiff | raw
2012-11-26 Junio C HamanoMerge branch 'nd/maint-compat-fnmatch-fix' blob | commitdiff | raw
2012-11-26 Junio C HamanoMerge branch 'bc/do-not-recurse-in-die' blob | commitdiff | raw
2012-11-26 Junio C HamanoMerge branch 'mk/complete-tcsh' blob | commitdiff | raw
2012-11-26 Junio C HamanoMerge branch 'jh/update-ref-d-through-symref' blob | commitdiff | raw
2012-11-26 Junio C HamanoMerge branch 'lt/diff-stat-show-0-lines' blob | commitdiff | raw
2012-11-26 Junio C HamanoMerge branch 'sg/complete-help-undup' blob | commitdiff | raw
2012-11-26 Junio C HamanoSync with 1.8.0.1 blob | commitdiff | raw
2012-11-21 Junio C HamanoMerge branch 'esr/maint-doc-fast-import' blob | commitdiff | raw
2012-11-21 Junio C HamanoMerge branch 'wtk/submodule-doc-fixup' blob | commitdiff | raw
2012-11-21 Junio C HamanoMerge branch 'so/prompt-command' blob | commitdiff | raw
2012-11-21 Junio C HamanoMerge branch 'jk/config-ignore-duplicates' blob | commitdiff | raw
2012-11-21 Junio C HamanoMerge branch 'jk/maint-http-half-auth-fetch' blob | commitdiff | raw
2012-11-20 Junio C HamanoMerge branch 'jk/checkout-out-of-unborn' blob | commitdiff | raw
2012-11-20 Junio C HamanoMerge branch 'cn/config-missing-path' blob | commitdiff | raw
2012-11-20 Junio C HamanoMerge branch 'jl/submodule-rm' blob | commitdiff | raw
2012-11-20 Junio C HamanoMerge branch 'jk/maint-gitweb-xss' blob | commitdiff | raw
2012-11-20 Junio C HamanoMerge branch 'rh/maint-gitweb-highlight-ext' blob | commitdiff | raw
2012-11-20 Junio C HamanoMerge branch 'pw/maint-p4-rcs-expansion-newline' blob | commitdiff | raw
2012-11-20 Junio C HamanoMerge branch 'mh/alt-odb-string-list-cleanup' blob | commitdiff | raw
2012-11-20 Junio C HamanoMerge branch 'ta/doc-cleanup' blob | commitdiff | raw
2012-11-20 Junio C HamanoMerge branch 'kb/preload-index-more' blob | commitdiff | raw
2012-11-20 Junio C HamanoMerge branch 'jk/maint-http-half-auth-fetch' blob | commitdiff | raw
2012-11-20 Junio C HamanoSync with maint blob | commitdiff | raw
2012-11-19 Junio C HamanoSync with maint blob | commitdiff | raw
2012-11-15 Junio C HamanoMerge branch 'jc/prettier-pretty-note' blob | commitdiff | raw
2012-11-15 Junio C HamanoMerge branch 'mg/maint-pull-suggest-upstream-to' blob | commitdiff | raw
2012-11-15 Junio C HamanoMerge branch 'mh/notes-string-list' blob | commitdiff | raw
2012-11-15 Junio C HamanoMerge branch 'mh/strbuf-split' blob | commitdiff | raw
2012-11-15 Junio C HamanoMerge branch 'mm/maint-doc-commit-edit' blob | commitdiff | raw
2012-11-15 Junio C HamanoMerge branch 'as/maint-doc-fix-no-post-rewrite' blob | commitdiff | raw
2012-11-15 Junio C HamanoMerge branch 'js/hp-nonstop' blob | commitdiff | raw
2012-11-15 Junio C HamanoMerge branch 'cr/cvsimport-local-zone' blob | commitdiff | raw
2012-11-15 Junio C HamanoMerge branch 'jc/same-encoding' blob | commitdiff | raw
2012-11-15 Junio C HamanoMerge branch 'ph/submodule-sync-recursive' blob | commitdiff | raw
2012-11-15 Junio C HamanoMerge branch 'jk/maint-diff-grep-textconv' blob | commitdiff | raw
2012-11-15 Junio C HamanoMerge branch 'jh/symbolic-ref-d' blob | commitdiff | raw
2012-11-15 Junio C HamanoMerge branch 'jc/maint-fetch-tighten-refname-check' blob | commitdiff | raw
2012-11-09 Jeff KingMerge branch 'ph/maint-submodule-status-fix' blob | commitdiff | raw
2012-11-09 Jeff KingMerge branch 'nd/builtin-to-libgit' blob | commitdiff | raw
2012-10-29 Nguyễn Thái Ngọc DuyMove try_merge_command and checkout_fast_forward to... blob | commitdiff | raw
Git—the stupid content tracker