pull: check if in unresolved merge state
[gitweb.git] / sha1_name.c
2015-06-05 Sync with 2.4.3
2015-06-05 Merge branch 'ld/p4-editor-multi-words'
2015-06-05 Merge branch 'bc/object-id'
2015-06-05 Merge branch 'jk/at-push-sha1'
2015-06-05 Merge branch 'dl/branch-error-message' into maint
2015-06-05 Merge branch 'jk/skip-http-tests-under-no-curl' into...
2015-06-05 Merge branch 'ps/doc-packfile-vs-pack-file' into maint
2015-06-05 Merge branch 'jk/rerere-forget-check-enabled' into...
2015-06-05 Merge branch 'ja/tutorial-asciidoctor-fix' into maint
2015-06-05 Merge branch 'jk/stripspace-asciidoctor-fix' into maint
2015-06-05 Merge branch 'ps/bundle-verify-arg' into maint
2015-06-05 Merge branch 'mg/log-decorate-HEAD' into maint
2015-06-05 Merge branch 'sb/t1020-cleanup' into maint
2015-06-05 Merge branch 'jc/gitignore-precedence' into maint
2015-06-05 Merge branch 'bc/connect-plink' into maint
2015-06-05 Merge branch 'jk/add-e-kill-editor' into maint
2015-06-05 Merge branch 'mh/clone-verbosity-fix' into maint
2015-06-05 Merge branch 'jk/sha1-file-reduce-useless-warnings...
2015-06-05 Merge branch 'tb/blame-resurrect-convert-to-git' into...
2015-06-05 Merge branch 'jc/plug-fmt-merge-msg-leak' into maint
2015-06-05 Merge branch 'pt/xdg-config-path' into maint
2015-06-01 Merge branch 'sb/test-bitmap-free-at-end'
2015-06-01 Merge branch 'mm/rebase-i-post-rewrite-exec'
2015-06-01 Merge branch 'fm/fetch-raw-sha1'
2015-06-01 Merge branch 'sg/help-group'
2015-06-01 Merge branch 'mm/log-format-raw-doc'
2015-06-01 Merge branch 'dt/cat-file-follow-symlinks'
2015-06-01 Merge branch 'rs/janitorial'
2015-06-01 Merge branch 'jk/stash-options'
2015-06-01 Merge branch 'mc/commit-doc-grammofix'
2015-06-01 Merge branch 'jh/filter-empty-contents'
2015-06-01 Merge branch 'ah/usage-strings'
2015-06-01 Merge branch 'dt/clean-pathspec-filter-then-lstat'
2015-05-27 Merge branch 'nd/untracked-cache'
2015-05-26 Merge branch 'jk/still-interesting' into maint
2015-05-26 Merge branch 'jc/hash-object' into maint
2015-05-26 Merge branch 'jk/rebase-quiet-noop' into maint
2015-05-26 Merge branch 'sg/complete-decorate-full-not-long' into...
2015-05-26 Merge branch 'jk/filter-branch-use-of-sed-on-incomplete...
2015-05-26 Merge branch 'jc/daemon-no-ipv6-for-2.4.1' into maint
2015-05-26 Merge branch 'jk/stash-require-clean-index' into maint
2015-05-26 Merge branch 'jk/git-no-more-argv0-path-munging' into...
2015-05-26 Merge branch 'nd/untracked-cache'
2015-05-26 Merge branch 'jk/rerere-forget-check-enabled'
2015-05-26 Merge branch 'jk/http-backend-deadlock-2.3' into jk...
2015-05-26 Merge branch 'jk/http-backend-deadlock-2.2' into jk...
2015-05-25 handle_one_ref(): rewrite to take an object_id argument
2015-05-25 each_ref_fn: change to take an object_id parameter
2015-05-22 Merge branch 'ps/doc-packfile-vs-pack-file'
2015-05-22 Merge branch 'sb/t1020-cleanup'
2015-05-22 Merge branch 'lm/squelch-bg-progress'
2015-05-22 Merge branch 'jc/ignore-epipe-in-filter'
2015-05-22 Merge branch 'mh/clone-verbosity-fix'
2015-05-22 Merge branch 'jk/add-e-kill-editor'
2015-05-22 Merge branch 'mg/log-decorate-HEAD'
2015-05-22 Merge branch 'jk/stripspace-asciidoctor-fix'
2015-05-22 Merge branch 'ja/tutorial-asciidoctor-fix'
2015-05-22 Merge branch 'ps/bundle-verify-arg'
2015-05-22 Merge branch 'jk/skip-http-tests-under-no-curl'
2015-05-22 Merge branch 'sg/completion-omit-credential-helpers'
2015-05-22 Merge branch 'dl/branch-error-message'
2015-05-22 sha1_name: implement @{push} shorthand
2015-05-22 sha1_name: refactor interpret_upstream_mark
2015-05-22 sha1_name: refactor upstream_mark
2015-05-21 remote.c: report specific errors from branch_get_upstream
2015-05-20 use file_exists() to check if a file exists in the...
2015-05-20 sha1_name: get_sha1_with_context learns to follow symlinks
2015-05-19 Merge branch 'jc/merge'
2015-05-19 Merge branch 'jc/test-prereq-validate'
2015-05-19 Merge branch 'bc/connect-plink'
2015-05-19 Merge branch 'jk/test-chain-lint'
2015-05-19 Merge branch 'jk/stash-require-clean-index'
2015-05-19 Merge branch 'jk/git-no-more-argv0-path-munging'
2015-05-19 Merge branch 'jc/gitignore-precedence'
2015-05-13 Merge branch 'sb/line-log-plug-pairdiff-leak' into...
2015-05-13 Merge branch 'nd/t1509-chroot-test' into maint
2015-05-13 Merge branch 'jk/type-from-string-gently' into maint
2015-05-13 Merge branch 'ep/fix-test-lib-functions-report' into...
2015-05-13 Merge branch 'cn/bom-in-gitignore' into maint
2015-05-13 Merge branch 'jk/prune-mtime' into maint
2015-05-13 Merge branch 'jk/init-core-worktree-at-root' into maint
2015-05-13 Merge branch 'mh/write-refs-sooner-2.2' into mh/write...
2015-05-11 Merge branch 'jc/diff-no-index-d-f' into maint-2.3
2015-05-11 Merge branch 'oh/fix-config-default-user-name-section...
2015-05-11 Merge branch 'jc/epochtime-wo-tz' into maint-2.3
2015-05-11 Merge branch 'pt/xdg-config-path'
2015-05-11 Merge branch 'ep/do-not-feed-a-pointer-to-array-size'
2015-05-11 Merge branch 'jc/hash-object'
2015-05-11 Merge branch 'sg/complete-decorate-full-not-long'
2015-05-11 Merge branch 'jk/filter-branch-use-of-sed-on-incomplete...
2015-05-11 Merge branch 'jc/daemon-no-ipv6-for-2.4.1'
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 'jk/rebase-quiet-noop'
2015-05-11 Merge branch 'va/p4-client-path'
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 'lm/squelch-bg-progress'
2015-05-11 Merge branch 'jk/sha1-file-reduce-useless-warnings'
next