l10n: zh_CN.po: 800+ new translations on command usages
[git.git] / ll-merge.c
2013-01-23 Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2013-01-22 Junio C HamanoMerge branch 'ph/rebase-preserve-all-merges'
2013-01-18 Junio C HamanoMerge branch 'nd/attr-debug-fix'
2013-01-18 Junio C HamanoMerge branch 'ds/completion-silence-in-tree-path-probe'
2013-01-14 Junio C HamanoMerge branch 'jc/blame-no-follow'
2013-01-14 Junio C HamanoMerge branch 'jk/maint-fast-import-doc-reorder' into...
2013-01-14 Junio C HamanoMerge branch 'jk/shortlog-no-wrap-doc' into maint
2013-01-14 Junio C HamanoMerge branch 'jk/maint-fast-import-doc-dedup-done'...
2013-01-14 Junio C HamanoMerge branch 'rs/leave-base-name-in-name-field-of-tar...
2013-01-14 Junio C HamanoMerge branch 'jl/interrupt-clone-remove-separate-git...
2013-01-14 Junio C HamanoMerge branch 'jc/maint-fmt-merge-msg-no-edit-lose-credi...
2013-01-14 Junio C HamanoMerge branch 'jc/apply-trailing-blank-removal' into...
2013-01-14 Junio C HamanoMerge branch 'mk/maint-graph-infinity-loop' into maint
2013-01-12 Junio C HamanoMerge branch 'jk/maint-fast-import-doc-reorder'
2013-01-12 Junio C HamanoMerge branch 'jk/shortlog-no-wrap-doc'
2013-01-12 Junio C HamanoMerge branch 'as/api-allocation-doc' into maint
2013-01-12 Junio C HamanoMerge branch 'os/gitweb-highlight-uncaptured' into...
2013-01-12 Junio C HamanoMerge branch 'jn/warn-on-inaccessible-loosen' into...
2013-01-10 Junio C HamanoMerge branch 'ta/remove-stale-translated-tut' into...
2013-01-10 Junio C HamanoMerge branch 'tb/test-t9020-no-which' into maint
2013-01-10 Junio C HamanoMerge branch 'sp/shortlog-missing-lf' into maint
2013-01-10 Junio C HamanoMerge branch 'as/api-allocation-doc'
2013-01-10 Junio C HamanoMerge branch 'rs/leave-base-name-in-name-field-of-tar'
2013-01-10 Junio C HamanoMerge branch 'jl/interrupt-clone-remove-separate-git...
2013-01-10 Junio C HamanoMerge branch 'as/dir-c-cleanup'
2013-01-10 Junio C HamanoMerge branch 'nd/wildmatch'
2013-01-10 Junio C HamanoMerge branch 'aw/rebase-am-failure-detection'
2013-01-10 Junio C HamanoMerge branch 'jc/maint-fmt-merge-msg-no-edit-lose-credit'
2013-01-09 Junio C HamanoMerge branch 'os/gitweb-highlight-uncaptured'
2013-01-08 Junio C HamanoMerge branch 'ta/remove-stale-translated-tut'
2013-01-08 Junio C HamanoMerge branch 'tb/test-t9020-no-which'
2013-01-08 Junio C HamanoMerge branch 'jk/maint-fast-import-doc-dedup-done'
2013-01-07 Junio C HamanoMerge branch 'jn/warn-on-inaccessible-loosen'
2013-01-07 Junio C HamanoMerge branch 'jc/apply-trailing-blank-removal'
2013-01-02 Junio C HamanoMerge branch 'sp/shortlog-missing-lf'
2013-01-02 Junio C HamanoMerge branch 'mk/maint-graph-infinity-loop'
2012-12-23 Junio C HamanoMerge branch 'nd/index-format-doc' into maint
2012-12-21 Junio C HamanoMerge branch 'nd/index-format-doc'
2012-12-11 Junio C HamanoMerge branch 'ef/mingw-rmdir'
2012-11-29 Junio C HamanoMerge branch 'jl/submodule-rm'
2012-11-26 Junio C HamanoMerge branch 'cn/config-missing-path' into maint
2012-11-21 Junio C HamanoMerge branch 'jk/maint-http-half-auth-fetch'
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-http-half-auth-fetch'
2012-11-20 Junio C HamanoMerge branch 'as/maint-doc-fix-no-post-rewrite' into...
2012-11-20 Junio C HamanoMerge branch 'rs/lock-correct-ref-during-delete' into...
2012-11-20 Junio C HamanoMerge branch 'js/format-2047' into maint
2012-11-19 Junio C HamanoMerge branch 'nd/grep-true-path' into maint
2012-11-19 Junio C HamanoMerge branch 'da/mergetools-p4' into maint
2012-11-19 Junio C HamanoMerge branch 'jc/test-say-color-avoid-echo-escape'...
2012-11-19 Junio C HamanoMerge branch 'bw/config-lift-variable-name-length-limit...
2012-11-15 Junio C HamanoMerge branch 'as/maint-doc-fix-no-post-rewrite'
2012-11-15 Junio C HamanoMerge branch 'jc/maint-fetch-tighten-refname-check'
2012-11-09 Jeff KingMerge branch 'nd/tree-walk-enum-cleanup'
2012-11-09 Jeff KingMerge branch 'js/format-2047'
2012-11-09 Jeff KingMerge branch 'rs/lock-correct-ref-during-delete'
2012-11-09 Jeff KingMerge branch 'nd/attr-match-optim-more'
2012-10-29 Jeff KingMerge branch 'nd/grep-true-path'
2012-10-29 Jeff KingMerge branch 'jk/maint-http-init-not-in-result-handler'
2012-10-29 Jeff KingMerge branch 'jl/submodule-rm'
2012-10-25 Jeff KingMerge branch 'jk/strbuf-detach-always-non-null'
2012-10-25 Jeff KingMerge branch 'js/mingw-fflush-errno'
2012-10-25 Jeff KingMerge branch 'da/mergetools-p4'
2012-10-25 Jeff KingMerge branch 'jc/test-say-color-avoid-echo-escape'
2012-10-25 Jeff KingMerge branch 'nd/attr-match-optim'
2012-10-25 Jeff KingMerge branch 'jk/peel-ref'
2012-10-25 Jeff KingMerge branch 'bw/config-lift-variable-name-length-limit'
2012-10-25 Jeff KingMerge branch 'fa/remote-svn'
2012-10-25 Jeff KingMerge branch 'jk/no-more-pre-exec-callback'
2012-10-17 Junio C HamanoMerge tag 'gitgui-0.17.0' of git://repo.or.cz/git-gui
2012-10-17 Junio C HamanoMerge branch 'jk/maint-http-half-auth-push' into maint
2012-10-17 Junio C HamanoMerge branch 'rr/git-uri-doc' into maint
2012-10-17 Junio C HamanoMerge branch 'bw/cp-a-is-gnuism' into maint
2012-10-17 Junio C HamanoMerge branch 'nd/doc-ignore' into maint
2012-10-17 Junio C HamanoMerge branch 'jc/doc-long-options' into maint
2012-10-17 Junio C HamanoMerge branch 'jc/maint-t1450-fsck-order-fix' into maint
2012-10-17 Junio C HamanoMerge branch 'rr/test-use-shell-path-not-shell' into...
2012-10-17 Junio C HamanoMerge branch 'rr/test-make-sure-we-have-git' into maint
2012-10-17 Junio C HamanoMerge branch 'po/maint-docs' into maint
2012-10-17 Junio C HamanoMerge branch 'jc/ll-merge-binary-ours' into maint
2012-10-16 Junio C HamanoMerge branch 'jk/maint-http-half-auth-push'
2012-10-14 Junio C HamanoMerge branch 'maint'
2012-10-12 Junio C HamanoMerge branch 'maint'
2012-10-10 Junio C HamanoMerge branch 'rr/git-uri-doc'
2012-10-10 Junio C HamanoMerge branch 'bw/cp-a-is-gnuism'
2012-10-10 Junio C HamanoMerge branch 'nd/doc-ignore'
2012-10-10 Junio C HamanoMerge branch 'jc/doc-long-options'
2012-10-10 Junio C HamanoSync with maint
2012-10-09 Junio C HamanoMerge branch 'maint'
2012-10-08 Junio C HamanoMerge branch 'jc/maint-t1450-fsck-order-fix'
2012-10-08 Junio C HamanoMerge branch 'jc/merge-bases-paint-fix'
2012-10-08 Junio C HamanoSync with 1.7.12.3
2012-10-08 Junio C HamanoMerge branch 'os/commit-submodule-ignore' into maint
2012-10-08 Junio C HamanoMerge branch 'lt/mailinfo-handle-attachment-more-sanely...
2012-10-03 Junio C HamanoMerge branch 'lt/mailinfo-handle-attachment-more-sanely'
2012-10-02 Junio C HamanoMerge branch 'maint'
2012-10-01 Junio C HamanoMerge branch 'jk/completion-tests'
2012-10-01 Junio C HamanoMerge branch 'ep/malloc-check-perturb'
2012-10-01 Junio C HamanoMerge branch 'da/mergetool-custom'
next