rebase -i: interrupt rebase when "commit --amend" failed during "reword"
[gitweb.git] / merge-recursive.h
2011-11-18 Merge branch 'jc/maint-name-rev-all' into maint
2011-11-18 Merge branch 'ml/mailmap' into maint
2011-11-18 Merge branch 'jn/maint-notes-avoid-va-args' into maint
2011-11-09 Merge branch 'jc/maint-remove-renamed-ref' into maint
2011-11-09 Merge branch 'jm/maint-gitweb-filter-forks-fix' into...
2011-11-01 Merge branch 'md/smtp-tls-hello-again' into maint
2011-11-01 Merge branch 'jk/pull-rebase-with-work-tree' into maint
2011-11-01 Merge branch 'jc/maint-diffstat-numstat-context' into...
2011-11-01 Merge branch 'js/bisect-no-checkout' into maint
2011-11-01 Merge branch 'sp/smart-http-failure' into maint
2011-11-01 Merge jn/maint-http-error-message
2011-10-26 Merge branch 'jk/argv-array' into maint
2011-10-26 Merge branch 'maint-1.7.6' into maint
2011-10-26 Merge branch 'maint-1.7.6' into maint
2011-10-26 Merge branch 'maint-1.7.4' into maint-1.7.5
2011-10-26 Merge branch 'maint-1.7.3' into maint-1.7.4
2011-10-26 Merge branch 'sn/doc-update-index-assume-unchanged...
2011-10-24 Merge branch 'maint-1.7.3' into maint
2011-10-21 Merge branch 'nd/maint-autofix-tag-in-head' into maint
2011-10-21 Merge branch 'jc/apply-blank-at-eof-fix' into maint
2011-10-21 Merge branch 'rs/diff-cleanup-records-fix' into maint
2011-10-21 Merge branch 'il/archive-err-signal' into maint
2011-10-21 Merge branch 'js/maint-merge-one-file-osx-expr' into...
2011-10-21 Merge branch 'jm/maint-apply-detects-corrupt-patch...
2011-10-21 Merge branch 'jc/checkout-from-tree-keep-local-changes...
2011-10-21 Merge branch 'mm/maint-config-explicit-bool-display...
2011-10-16 Merge branch 'ms/patch-id-with-overlong-line' into...
2011-10-16 Merge branch 'jc/maint-bundle-too-quiet' into maint
2011-10-16 Merge branch 'jk/filter-branch-require-clean-work-tree...
2011-10-16 Merge branch 'jc/maint-fsck-fwrite-size-check' into...
2011-10-16 Merge branch 'bk/ancestry-path' into maint
2011-10-16 Merge branch 'jk/maint-fetch-submodule-check-fix' into...
2011-10-16 Merge branch 'tr/mergetool-valgrind' into maint
2011-10-16 Merge branch 'nm/grep-object-sha1-lock' into maint
2011-10-16 Merge branch 'jc/diff-index-unpack' into maint
2011-10-16 Merge branch 'mm/rebase-i-exec-edit' into maint
2011-09-26 Merge branch 'jc/namespace-doc-with-old-asciidoc'
2011-09-23 Merge 1.7.6.4 in
2011-09-23 Merge branch 'mh/check-ref-format-print-normalize'...
2011-09-23 Merge branch 'gb/maint-am-patch-format-error-message...
2011-09-20 Merge branch 'maint'
2011-09-19 Merge branch 'ph/format-patch-no-color'
2011-09-17 Merge branch 'ci/forbid-unwanted-current-branch-update'
2011-09-15 Merge branch 'ph/format-patch-no-color'
2011-09-12 Sync with 1.7.6.3
2011-09-12 Merge branch 'jn/remote-helpers-doc'
2011-09-12 Merge branch 'maint'
2011-09-12 Merge branch 'jk/tag-contains-ab' (early part) into...
2011-09-12 Merge branch 'jk/maint-1.7.2-status-ignored' into maint
2011-09-06 Merge branch 'rc/histogram-diff'
2011-09-06 Merge branch 'cb/maint-ls-files-error-report'
2011-09-06 Merge branch 'mh/check-ref-format-print-normalize'
2011-09-06 Sync with 1.7.6.2
2011-09-02 Merge branch 'js/i18n-scripts-2'
2011-09-02 Merge branch 'tr/maint-t3903-misquoted-command'
2011-09-02 Merge branch 'bc/bisect-test-use-shell-path'
2011-09-02 Merge branch 'va/p4-branch-import-test-update'
2011-09-02 Merge branch 'tr/maint-strbuf-grow-nul-termination'
2011-09-02 Merge branch 'tr/maint-ident-to-git-memmove'
2011-09-02 Merge branch 'tr/maint-format-patch-empty-output'
2011-09-02 Merge branch 'gb/maint-am-stgit-author-to-from-fix'
2011-09-02 Merge branch 'gb/maint-am-patch-format-error-message'
2011-09-02 Merge branch 'ms/daemon-timeout-is-in-seconds'
2011-09-02 Merge branch 'bg/t5540-osx-grep'
2011-09-02 Merge branch 'jc/clean-exclude-doc'
2011-09-02 Merge branch 'mg/maint-notes-C-doc'
2011-09-02 Merge branch 'fg/submodule-ff-check-before-push'
2011-09-02 Merge branch 'rc/diff-cleanup-records'
2011-09-02 Merge branch 'fk/use-kwset-pickaxe-grep-f'
2011-09-02 Merge branch 'en/merge-recursive-2'
2011-08-25 Merge branch 'jn/plug-empty-tree-leak'
2011-08-23 Merge branch 'jc/maint-combined-diff-work-tree' into...
2011-08-18 Merge branch 'jc/maint-combined-diff-work-tree'
2011-08-16 Merge branch 'jk/fast-export-quote-path' into maint
2011-08-16 Merge branch 'bw/log-all-ref-updates-doc' into maint
2011-08-16 Merge branch 'js/maint-add-path-stat-pwd' into maint
2011-08-16 Merge branch 'jn/mime-type-with-params' into maint
2011-08-16 Merge branch 'jc/submodule-sync-no-auto-vivify' into...
2011-08-16 Merge branch 'bc/submodule-foreach-stdin-fix-1.7.4...
2011-08-14 merge-recursive: Save D/F conflict filenames instead...
2011-08-11 Merge branch 'jk/fast-export-quote-path'
2011-08-01 Merge branch 'jk/clone-detached'
2011-08-01 Merge branch 'jc/legacy-loose-object' into maint
2011-08-01 Merge branch 'jc/maint-1.7.3-checkout-describe' into...
2011-07-22 Merge branch 'jk/tag-contains-ab'
2011-07-22 Merge branch 'bw/log-all-ref-updates-doc'
2011-07-22 Merge branch 'js/maint-add-path-stat-pwd'
2011-07-19 Merge branch 'jc/index-pack'
2011-07-19 Merge branch 'jn/mime-type-with-params'
2011-07-19 Merge branch 'jc/submodule-sync-no-auto-vivify'
2011-07-13 Merge branch 'js/rebase-typo-branch-squelch-usage'
2011-07-13 Merge branch 'bc/submodule-foreach-stdin-fix-1.7.4'
2011-07-13 Merge branch 'jc/legacy-loose-object'
2011-07-06 Merge commit 'v1.7.6' into jc/checkout-reflog-fix
2011-07-06 Merge commit 'v1.7.0' into jc/checkout-reflog-fix
2011-06-30 Merge branch 'ef/maint-win-verify-path'
2011-06-30 Merge branch 'jc/maint-1.7.3-checkout-describe'
2011-06-30 Merge branch 'jk/maint-1.7.2-status-ignored'
2011-06-30 Merge branch 'jc/advice-about-to-lose-commit'
2011-06-29 Merge branch 'jn/maint-doc-dashdash' into jn/doc-dashdash
next