Merge branch 'ks/rebase-i-abbrev'
[gitweb.git] / Documentation / howto / revert-a-faulty-merge.txt
2014-06-25 Merge branch 'jc/apply-ignore-whitespace' into maint
2014-06-25 Merge branch 'jc/revision-dash-count-parsing' into...
2014-06-25 Merge branch 'jk/report-fail-to-read-objects-better...
2014-06-20 Merge branch 'jc/test-lazy-prereq' (early part)
2014-06-20 Merge branch 'tb/t5551-clone-notice-to-stderr'
2014-06-20 Merge branch 'jc/revision-dash-count-parsing'
2014-06-16 Merge branch 'jk/error-resolve-conflict-advice'
2014-06-16 Merge branch 'nd/daemonize-gc'
2014-06-16 Merge branch 'jl/status-added-submodule-is-never-ignored'
2014-06-16 Merge branch 'jk/daemon-tolower'
2014-06-16 Merge branch 'jk/diff-follow-must-take-one-pathspec'
2014-06-16 Merge branch 'rr/rebase-autostash-fix'
2014-06-16 Merge branch 'jk/report-fail-to-read-objects-better'
2014-06-16 Merge branch 'jk/diff-files-assume-unchanged'
2014-06-16 Merge branch 'mt/patch-id-stable' (early part)
2014-06-12 Merge branch 'jc/rev-parse-argh-dashed-multi-words...
2014-06-09 Merge branch 'jc/shortlog-ref-exclude'
2014-06-09 Merge branch 'rs/mailinfo-header-cmp'
2014-06-09 Merge branch 'na/no-http-test-in-the-middle'
2014-06-09 Merge branch 'jc/rev-parse-argh-dashed-multi-words'
2014-06-09 Merge branch 'lt/request-pull'
2014-06-06 Merge branch 'jn/test-lint-unmoor'
2014-06-06 Merge branch 'ep/shell-assign-and-export-vars'
2014-06-06 Merge branch 'mt/rebase-i-keep-empty-test'
2014-06-06 Merge branch 'mk/show-s-no-extra-blank-line-for-merges'
2014-06-06 Merge branch 'sk/spawn-less-case-insensitively-from...
2014-06-06 Merge branch 'tb/unicode-6.3-zero-width'
2014-06-06 Merge branch 'bc/blame-crlf-test'
2014-06-06 Merge branch 'sk/submodules-absolute-path-on-windows'
2014-06-06 Merge branch 'fc/status-printf-squelch-format-zero...
2014-06-06 Merge branch 'jk/commit-C-pick-empty'
2014-06-03 Merge branch 'ep/shell-command-substitution'
2014-06-03 Merge branch 'fc/rerere-conflict-style'
2014-06-03 Merge branch 'nd/index-pack-one-fd-per-thread'
2014-06-03 Merge branch 'ym/fix-opportunistic-index-update-race'
2014-06-03 Merge branch 'mh/ref-transaction'
2014-06-03 Merge branch 'ks/tree-diff-nway'
2014-06-03 Merge branch 'jc/apply-ignore-whitespace'
2014-06-03 Merge branch 'as/grep-fullname-config'
2014-05-28 Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname...
2014-05-28 Merge branch 'mw/symlinks' into maint
2014-05-19 Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname'
2014-05-19 Merge branch 'lt/request-pull'
2014-05-19 Merge branch 'jl/use-vsatisfy-correctly-for-2.0'
2014-05-19 Merge branch 'kb/fast-hashmap'
2014-05-08 Merge branch 'cl/p4-use-diff-tree' into maint
2014-05-08 Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname...
2014-05-08 Merge branch 'tb/unicode-6.3-zero-width' into maint
2014-05-08 Merge branch 'km/avoid-bs-in-shell-glob' into maint
2014-05-08 Merge branch 'km/avoid-cp-a' into maint
2014-05-07 Merge branch 'cl/p4-use-diff-tree'
2014-05-02 Merge branch 'mw/symlinks'
2014-05-02 Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname'
2014-04-24 Merge branch 'jk/pack-bitmap'
2014-04-21 Merge branch 'ep/shell-command-substitution'
2014-04-18 Merge branch 'jk/config-die-bad-number-noreturn'
2014-04-16 Merge branch 'mh/multimail'
2014-04-16 Merge branch 'tb/unicode-6.3-zero-width'
2014-04-16 Merge branch 'km/avoid-cp-a'
2014-04-16 Merge branch 'km/avoid-bs-in-shell-glob'
2014-04-09 Merge branch 'jl/nor-or-nand-and' into maint
2014-04-09 Merge branch 'jk/commit-dates-parsing-fix' into maint
2014-04-09 Merge commit 'doc/http-backend: missing accent grave...
2014-04-08 Merge branch 'maint'
2014-04-08 Merge branch 'jk/pack-bitmap'
2014-04-08 Merge branch 'jl/nor-or-nand-and'
2014-04-08 Merge branch 'jk/commit-dates-parsing-fix'
2014-04-03 Merge branch 'mh/remove-subtree-long-pathname-fix'...
2014-04-03 Merge branch 'jc/stash-pop-not-popped' into maint
2014-03-31 Merge branch 'wt/doc-submodule-name-path-confusion-1'
2014-03-31 Merge branch 'dw/doc-status-no-longer-shows-pound-prefix'
2014-03-31 Documentation: fix misuses of "nor"
2014-03-25 Merge branch 'dm/configure-iconv-locale-charset'
2014-03-25 Merge branch 'mh/remove-subtree-long-pathname-fix'
2014-03-25 Merge branch 'cp/am-patch-format-doc'
2014-03-21 Merge branch 'es/sh-i18n-envsubst'
2014-03-21 Merge branch 'jc/stash-pop-not-popped'
2014-03-18 Merge branch 'jk/commit-dates-parsing-fix' into maint
2014-03-18 Merge branch 'tr/diff-submodule-no-reuse-worktree'...
2014-03-18 Merge branch 'jc/check-attr-honor-working-tree' into...
2014-03-18 Merge branch 'bk/refresh-missing-ok-in-merge-recursive...
2014-03-18 Merge branch 'jk/config-path-include-fix' into maint
2014-03-18 Merge branch 'nd/diff-quiet-stat-dirty' into maint
2014-03-18 Merge branch 'mh/simplify-cache-tree-find'
2014-03-18 Merge branch 'jn/branch-lift-unnecessary-name-length...
2014-03-18 Merge branch 'nd/sha1-file-delta-stack-leakage-fix'
2014-03-14 Merge branch 'sh/write-pack-file-warning-message-fix'
2014-03-14 Merge branch 'jk/commit-dates-parsing-fix'
2014-03-14 Merge branch 'jh/note-trees-record-blobs'
2014-03-14 Merge branch 'tr/diff-submodule-no-reuse-worktree'
2014-03-14 Merge branch 'jc/check-attr-honor-working-tree'
2014-03-07 Merge branch 'jc/hold-diff-remove-q-synonym-for-no...
2014-03-07 Merge branch 'jc/core-checkstat-2.0'
2014-03-07 Merge branch 'jc/add-2.0-ignore-removal'
2014-03-07 Merge branch 'jn/add-2.0-u-A-sans-pathspec'
2014-03-07 Merge branch 'jc/push-2.0-default-to-simple'
2014-03-03 Merge branch 'sh/write-pack-file-warning-message-fix...
2014-02-27 Merge branch 'nd/test-rename-reset'
2014-02-27 Merge branch 'bs/stdio-undef-before-redef'
2014-02-27 Merge branch 'jk/config-path-include-fix'
next