pull: check if in unresolved merge state
[gitweb.git] / git-am.sh
2015-05-11 Merge branch 'jn/clean-use-error-not-fprintf-on-stderr'
2015-05-11 Merge branch 'tb/blame-resurrect-convert-to-git'
2015-05-11 Merge branch 'va/fix-git-p4-tests'
2015-05-11 Merge branch 'ld/p4-case-fold'
2015-05-11 Merge branch 'jk/rebase-quiet-noop'
2015-05-11 Merge branch 'va/p4-client-path'
2015-05-11 Merge branch 'mm/add-p-split-error'
2015-05-11 Merge branch 'tb/t0027-crlf'
2015-05-11 Merge branch 'ls/p4-changes-block-size'
2015-05-11 Merge branch 'jc/plug-fmt-merge-msg-leak'
2015-05-11 Merge branch 'nd/slim-index-pack-memory-usage'
2015-05-11 Merge branch 'jk/still-interesting'
2015-05-11 Merge branch 'jk/reading-packed-refs'
2015-05-11 Merge branch 'lm/squelch-bg-progress'
2015-05-11 Merge branch 'jk/sha1-file-reduce-useless-warnings'
2015-05-11 Merge branch 'nd/multiple-work-trees'
2015-05-06 Merge branch 'jk/prune-mtime'
2015-05-06 Merge branch 'ep/fix-test-lib-functions-report'
2015-05-06 Merge branch 'cn/bom-in-gitignore'
2015-05-06 Merge branch 'jc/epochtime-wo-tz'
2015-05-06 Merge branch 'nd/t1509-chroot-test'
2015-05-06 Merge branch 'oh/fix-config-default-user-name-section'
2015-05-06 Merge branch 'jk/type-from-string-gently'
2015-05-06 Merge branch 'jk/init-core-worktree-at-root'
2015-05-06 Merge branch 'sb/line-log-plug-pairdiff-leak'
2015-05-06 Merge branch 'jc/diff-no-index-d-f'
2015-04-28 Merge branch 'mg/show-notes-doc'
2015-04-28 Merge branch 'nd/versioncmp-prereleases'
2015-04-27 Merge branch 'tb/connect-ipv6-parse-fix' into maint
2015-04-27 Merge branch 'ma/bash-completion-leaking-x' into maint
2015-04-27 Merge branch 'jc/push-cert' into maint
2015-04-21 Merge branch 'jk/colors' into maint
2015-04-21 Merge branch 'pt/enter-repo-comment-fix' into maint
2015-04-21 Merge branch 'jz/gitweb-conf-doc-fix' into maint
2015-04-21 Merge branch 'jk/cherry-pick-docfix' into maint
2015-04-21 Merge branch 'iu/fix-parse-options-h-comment' into...
2015-04-21 Merge branch 'jg/cguide-we-cannot-count' into maint
2015-04-21 Merge branch 'jk/pack-corruption-post-mortem' into...
2015-04-21 Merge branch 'jn/doc-fast-import-no-16-octopus-limit...
2015-04-20 Merge branch 'ps/grep-help-all-callback-arg'
2015-04-20 Merge branch 'tb/connect-ipv6-parse-fix'
2015-04-20 Merge branch 'va/fix-git-p4-tests'
2015-04-20 Merge branch 'jc/push-cert'
2015-04-20 Merge branch 'ma/bash-completion-leaking-x'
2015-04-19 Merge tag 'gitgui-0.20.0' of repo.or.cz/r/git-gui
2015-04-14 Merge branch 'jk/colors'
2015-04-14 Merge branch 'jk/merge-quiet'
2015-04-14 Merge branch 'jk/pack-corruption-post-mortem'
2015-04-14 Merge branch 'jc/update-instead-into-void'
2015-04-14 Merge branch 'sb/plug-streaming-leak'
2015-04-14 Merge branch 'jn/doc-fast-import-no-16-octopus-limit'
2015-04-14 Merge branch 'sb/plug-wt-shortstatus-tracking-leak'
2015-04-14 Merge branch 'pt/enter-repo-comment-fix'
2015-04-14 Merge branch 'jz/gitweb-conf-doc-fix'
2015-04-14 Merge branch 'jk/cherry-pick-docfix'
2015-04-14 Merge branch 'iu/fix-parse-options-h-comment'
2015-04-14 Merge branch 'jg/cguide-we-cannot-count'
2015-04-02 Merge branch 'sb/atomic-push'
2015-03-31 Merge branch 'ss/pull-rebase-preserve' into maint
2015-03-31 Merge branch 'jc/report-path-error-to-dir' into maint
2015-03-31 Merge branch 'ph/push-doc-cas' into maint
2015-03-28 Merge branch 'ph/push-doc-cas'
2015-03-28 Merge branch 'ss/pull-rebase-preserve'
2015-03-28 Merge branch 'jk/simplify-csum-file-sha1fd-check' into...
2015-03-28 Merge branch 'nd/doc-git-index-version' into maint
2015-03-28 Merge branch 'ct/prompt-untracked-fix' into maint
2015-03-28 Merge branch 'ws/grep-quiet-no-pager' into maint
2015-03-28 Merge branch 'jc/submitting-patches-mention-send-email...
2015-03-28 Merge branch 'jk/cleanup-failed-clone' into maint
2015-03-28 Merge branch 'jk/fetch-pack' into maint
2015-03-28 Merge branch 'jn/doc-api-errors'
2015-03-27 Merge branch 'jk/tag-h-column-is-a-listing-option'...
2015-03-27 Merge branch 'jk/smart-http-hide-refs' into maint
2015-03-27 Merge branch 'js/completion-ctags-pattern-substitution...
2015-03-26 Merge branch 'jc/report-path-error-to-dir'
2015-03-25 Merge branch 'nd/doc-git-index-version'
2015-03-25 Merge branch 'jk/fetch-pack'
2015-03-25 Merge branch 'jk/cleanup-failed-clone'
2015-03-25 Merge branch 'jc/submitting-patches-mention-send-email'
2015-03-25 Merge branch 'kd/rev-list-bisect-first-parent'
2015-03-25 Merge branch 'ws/grep-quiet-no-pager'
2015-03-25 Merge branch 'jk/simplify-csum-file-sha1fd-check'
2015-03-25 Merge branch 'ct/prompt-untracked-fix'
2015-03-24 Merge branch 'master' of git://ozlabs.org/~paulus/gitk
2015-03-23 Merge branch 'js/completion-ctags-pattern-substitution...
2015-03-23 Merge branch 'jk/smart-http-hide-refs'
2015-03-23 Merge branch 'jk/tag-h-column-is-a-listing-option'
2015-03-23 Merge branch 'rs/use-isxdigit' into maint
2015-03-23 Merge branch 'rs/deflate-init-cleanup' into maint
2015-03-23 Merge branch 'jc/decorate-leaky-separator-color' into...
2015-03-23 Merge branch 'km/imap-send-libcurl-options' into maint
2015-03-23 Merge branch 'mg/verify-commit' into maint
2015-03-23 Merge branch 'es/rebase-i-count-todo' into maint
2015-03-23 Merge branch 'tb/connect-ipv6-parse-fix' into maint
2015-03-20 Merge branch 'jc/decorate-leaky-separator-color'
2015-03-20 Merge branch 'rs/use-isxdigit'
2015-03-20 Merge branch 'mg/verify-commit'
2015-03-20 Merge branch 'km/imap-send-libcurl-options'
2015-03-20 Merge branch 'nd/versioncmp-prereleases'
2015-03-17 Merge branch 'mg/sequencer-commit-messages-always-verbatim'
next