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