Merge branch 'nd/index-pack-error-message' into maint
[gitweb.git] / Documentation / howto / revert-a-faulty-merge.txt
2013-10-30 Merge branch 'tr/gitk-doc-update'
2013-10-30 Merge branch 'jl/pack-transfer-avoid-double-close'
2013-10-30 Merge branch 'sb/git-svn-docs-indent-with-ht'
2013-10-30 Merge branch 'nd/magic-pathspec'
2013-10-30 Merge branch 'nd/gc-lock-against-each-other'
2013-10-30 Merge branch 'hn/log-graph-color-octopus'
2013-10-30 Merge branch 'mm/checkout-auto-track-fix'
2013-10-30 Merge branch 'sg/t3600-nul-sha1-fix'
2013-10-30 Merge branch 'jc/upload-pack-send-symref'
2013-10-30 Merge branch 'jk/http-auth-redirects'
2013-10-28 Sync with v1.8.4.2
2013-10-28 Merge branch 'sb/repack-in-c'
2013-10-28 Merge branch 'sg/prompt-svn-remote-fix'
2013-10-28 Merge branch 'jk/split-broken-ident'
2013-10-28 Merge branch 'jk/remote-literal-string-leakfix'
2013-10-28 Merge branch 'ew/keepalive'
2013-10-28 Merge branch 'jc/revision-range-unpeel'
2013-10-28 Merge branch 'jx/relative-path-regression-fix'
2013-10-28 Merge branch 'jk/diff-algo' into maint
2013-10-23 Sync with 'maint'
2013-10-23 Merge branch 'bc/gnome-keyring'
2013-10-23 Merge branch 'po/dot-url'
2013-10-23 Merge branch 'jc/prompt-upstream'
2013-10-23 Merge branch 'hu/cherry-pick-previous-branch'
2013-10-23 Merge branch 'mg/more-textconv'
2013-10-23 Merge branch 'jc/pack-objects'
2013-10-18 Merge branch 'maint'
2013-10-18 Merge branch 'jc/reflog-doc'
2013-10-18 Merge branch 'sb/repack-in-c'
2013-10-18 Merge branch 'jk/clone-progress-to-stderr'
2013-10-17 Merge branch 'jk/format-patch-from'
2013-10-17 Merge branch 'es/name-hash-no-trailing-slash-in-dirs'
2013-10-17 Merge branch 'jk/trailing-slash-in-pathspec'
2013-10-17 Merge branch 'lc/filter-branch-too-many-refs'
2013-10-17 Merge branch 'jc/checkout-detach-doc'
2013-10-17 Sync with maint
2013-10-17 Merge branch 'jc/cvsserver-perm-bit-fix' into maint
2013-10-16 Merge git://git.bogomips.org/git-svn
2013-10-15 Merge branch 'maint'
2013-10-14 Merge branch 'rj/highlight-test-hang'
2013-10-14 Merge branch 'nv/doc-config-signingkey'
2013-10-14 Merge branch 'sb/checkout-test-complex-path'
2013-10-14 Merge branch 'rt/cherry-pick-status'
2013-10-14 Merge branch 'rj/doc-formatting-fix'
2013-10-14 Merge branch 'jk/diff-algo'
2013-10-14 howto/revert-a-faulty-merge: fix unescaped '^'s
2013-10-08 Merge branch 'tz/credential-netrc'
2013-09-26 Merge branch 'js/xread-in-full' into maint
2013-09-18 Merge branch 'jc/cvsserver-perm-bit-fix'
2013-09-12 Merge branch 'mn/doc-pack-heu-remove-dead-pastebin'
2013-09-11 Merge branch 'js/xread-in-full'
2013-09-04 Merge branch 'tr/fd-gotcha-fixes'
2013-08-05 Merge branch 'dn/test-reject-utf-16'
2013-07-31 Merge branch 'jk/commit-how-to-abort-cherry-pick'
2013-07-31 Merge branch 'ds/doc-two-kinds-of-tags'
2013-07-30 Merge branch 'jk/capabilities-doc'
2013-07-22 Merge branch 'mk/upload-pack-off-by-one-dead-code-removal'
2013-07-22 Merge branch 'jk/t0008-sigpipe-fix'
2013-07-22 Merge branch 'tr/protect-low-3-fds'
2013-07-22 Merge branch 'sb/parse-object-buffer-eaten'
2013-07-22 Merge branch 'tr/fd-gotcha-fixes'
2013-07-22 Merge branch 'rr/maint-fetch-tag-doc-asterisks' into...
2013-07-22 Merge branch 'dk/maint-t5150-dirname' into maint
2013-07-22 Merge branch 'dk/version-gen-gitdir' into maint
2013-07-22 Merge branch 'nk/config-local-doc' into maint
2013-07-22 Merge branch 'kb/diff-blob-blob-doc' into maint
2013-07-22 Merge branch 'mm/merge-in-dirty-worktree-doc' into...
2013-07-22 Merge branch 'ph/builtin-srcs-are-in-subdir-these-days...
2013-07-22 Merge branch 'mh/maint-lockfile-overflow' into maint
2013-07-22 Merge branch 'jc/maint-diff-core-safecrlf' into maint
2013-07-19 Merge branch 'rr/name-rev-stdin-doc' into maint
2013-07-19 Merge branch 'ft/diff-rename-default-score-is-half...
2013-07-19 Merge branch 'jc/t1512-fix' into maint
2013-07-19 Merge branch 'mm/push-force-is-dangerous' into maint
2013-07-15 Merge branch 'tr/maint-apply-non-git-patch-parsefix...
2013-07-15 Merge branch 'bc/http-keep-memory-given-to-curl' into...
2013-07-12 Merge branch 'rs/pickaxe-simplify'
2013-07-12 Merge branch 'rr/name-rev-stdin-doc'
2013-07-12 Merge branch 'ft/diff-rename-default-score-is-half'
2013-07-11 Merge branch 'jc/t1512-fix'
2013-07-11 Merge branch 'jc/maint-diff-core-safecrlf'
2013-07-11 Merge branch 'mh/maint-lockfile-overflow'
2013-07-03 Merge branch 'cr/git-work-tree-sans-git-dir' into maint
2013-07-03 Merge branch 'fc/do-not-use-the-index-in-add-to-index...
2013-07-03 Merge branch 'cb/log-follow-with-combined' into maint
2013-07-03 Merge branch 'maint-1.8.1' into maint-1.8.2
2013-06-27 Merge branch 'mk/combine-diff-context-horizon-fix'...
2013-06-27 Merge branch 'bc/http-keep-memory-given-to-curl'
2013-06-26 Merge branch 'tr/maint-apply-non-git-patch-parsefix'
2013-06-26 Merge branch 'ph/builtin-srcs-are-in-subdir-these-days'
2013-06-26 Merge branch 'mm/merge-in-dirty-worktree-doc'
2013-06-26 Merge branch 'kb/diff-blob-blob-doc'
2013-06-26 Merge branch 'mm/push-force-is-dangerous'
2013-06-24 Merge branch 'nk/config-local-doc'
2013-06-24 Merge branch 'dk/version-gen-gitdir'
2013-06-24 Merge branch 'dk/maint-t5150-dirname'
2013-06-17 Merge tag 'gitgui-0.18.0' of git://repo.or.cz/git-gui
2013-06-11 Merge branch 'rr/maint-fetch-tag-doc-asterisks'
2013-06-11 Merge branch 'cr/git-work-tree-sans-git-dir'
2013-06-11 Merge branch 'cb/log-follow-with-combined'
next