Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅
next
commit
grep
author
committer
pickaxe
?
re
Merge branch 'es/osx-header-pollutes-mask-macro'
[gitweb.git]
/
builtin
/
merge.c
2015-06-24
Merge branch 'es/osx-header-pollutes-mask-macro'
blob
|
diff
|
raw
2015-06-24
Merge branch 'es/configure-getdelim'
blob
|
diff
|
raw
2015-06-24
Merge branch 'pt/pull-optparse'
blob
|
diff
|
raw
2015-06-24
Merge branch 'qn/blame-show-email'
blob
|
diff
|
raw
2015-06-24
Merge branch 'jc/do-not-feed-tags-to-clear-commit-marks'
blob
|
diff
|
raw
2015-06-24
Merge branch 'es/send-email-sendmail-alias'
blob
|
diff
|
raw
2015-06-24
Merge branch 'jc/apply-reject-noop-hunk'
blob
|
diff
|
raw
2015-06-16
Sync with 2.4.4
blob
|
diff
|
raw
2015-06-16
Merge branch 'jk/clone-dissociate' into maint
blob
|
diff
|
raw
|
diff to current
2015-06-16
Merge branch 'mc/commit-doc-grammofix' into maint
blob
|
diff
|
raw
|
diff to current
2015-06-16
Merge branch 'sb/test-bitmap-free-at-end' into maint
blob
|
diff
|
raw
|
diff to current
2015-06-16
Merge branch 'dt/clean-pathspec-filter-then-lstat'...
blob
|
diff
|
raw
|
diff to current
2015-06-16
Merge branch 'jh/filter-empty-contents' into maint
blob
|
diff
|
raw
|
diff to current
2015-06-16
Merge branch 'jk/stash-options' into maint
blob
|
diff
|
raw
|
diff to current
2015-06-16
Merge branch 'mm/log-format-raw-doc' into maint
blob
|
diff
|
raw
|
diff to current
2015-06-16
Merge branch 'ep/do-not-feed-a-pointer-to-array-size...
blob
|
diff
|
raw
|
diff to current
2015-06-16
Merge branch 'nd/slim-index-pack-memory-usage'
blob
|
diff
|
raw
2015-06-16
Merge branch 'sb/pack-protocol-mention-smart-http'
blob
|
diff
|
raw
2015-06-16
Merge branch 'jk/make-fix-dependencies'
blob
|
diff
|
raw
2015-06-16
Merge branch 'jk/die-on-bogus-worktree-late'
blob
|
diff
|
raw
2015-06-16
Merge branch 'sg/merge-summary-config'
blob
|
diff
|
raw
2015-06-16
Merge branch 'ah/send-email-sendmail-alias'
blob
|
diff
|
raw
2015-06-11
Merge branch 'tb/complete-sequencing'
blob
|
diff
|
raw
2015-06-11
Merge branch 'jk/squelch-missing-link-warning-for-unrea...
blob
|
diff
|
raw
2015-06-11
Merge branch 'pt/pull-tests'
blob
|
diff
|
raw
2015-06-11
Merge branch 'sb/glossary-submodule'
blob
|
diff
|
raw
2015-06-11
Merge branch 'sb/submodule-doc-intro'
blob
|
diff
|
raw
2015-06-11
Merge branch 'jk/diagnose-config-mmap-failure'
blob
|
diff
|
raw
2015-06-11
Merge branch 'mt/p4-depotFile-at-version'
blob
|
diff
|
raw
2015-06-11
Merge branch 'mh/verify-lock-error-report'
blob
|
diff
|
raw
2015-06-11
Merge branch 'jk/color-diff-plain-is-context'
blob
|
diff
|
raw
2015-06-11
Merge branch 'jk/clone-dissociate'
blob
|
diff
|
raw
2015-06-11
Merge branch 'jc/diff-ws-error-highlight'
blob
|
diff
|
raw
2015-06-05
Sync with 2.4.3
blob
|
diff
|
raw
2015-06-05
Merge branch 'ld/p4-editor-multi-words'
blob
|
diff
|
raw
2015-06-05
Merge branch 'bc/object-id'
blob
|
diff
|
raw
2015-06-05
Merge branch 'jk/at-push-sha1'
blob
|
diff
|
raw
2015-06-05
Merge branch 'dl/branch-error-message' into maint
blob
|
diff
|
raw
|
diff to current
2015-06-05
Merge branch 'jk/skip-http-tests-under-no-curl' into...
blob
|
diff
|
raw
|
diff to current
2015-06-05
Merge branch 'ps/doc-packfile-vs-pack-file' into maint
blob
|
diff
|
raw
|
diff to current
2015-06-05
Merge branch 'jk/rerere-forget-check-enabled' into...
blob
|
diff
|
raw
|
diff to current
2015-06-05
Merge branch 'pt/pull-log-n' into maint
blob
|
diff
|
raw
|
diff to current
2015-06-05
Merge branch 'rs/plug-leak-in-pack-bitmaps' into maint
blob
|
diff
|
raw
|
diff to current
2015-06-05
Merge branch 'ja/tutorial-asciidoctor-fix' into maint
blob
|
diff
|
raw
|
diff to current
2015-06-05
Merge branch 'jk/stripspace-asciidoctor-fix' into maint
blob
|
diff
|
raw
|
diff to current
2015-06-05
Merge branch 'jk/asciidoc-markup-fix' into maint
blob
|
diff
|
raw
|
diff to current
2015-06-05
Merge branch 'ps/bundle-verify-arg' into maint
blob
|
diff
|
raw
|
diff to current
2015-06-05
Merge branch 'mg/log-decorate-HEAD' into maint
blob
|
diff
|
raw
|
diff to current
2015-06-05
Merge branch 'sb/t1020-cleanup' into maint
blob
|
diff
|
raw
|
diff to current
2015-06-05
Merge branch 'jc/gitignore-precedence' into maint
blob
|
diff
|
raw
|
diff to current
2015-06-05
Merge branch 'bc/connect-plink' into maint
blob
|
diff
|
raw
|
diff to current
2015-06-05
Merge branch 'ph/rebase-i-redo' into maint
blob
|
diff
|
raw
|
diff to current
2015-06-05
Merge branch 'jk/add-e-kill-editor' into maint
blob
|
diff
|
raw
|
diff to current
2015-06-05
Merge branch 'mh/clone-verbosity-fix' into maint
blob
|
diff
|
raw
|
diff to current
2015-06-05
Merge branch 'jk/sha1-file-reduce-useless-warnings...
blob
|
diff
|
raw
|
diff to current
2015-06-05
Merge branch 'tb/blame-resurrect-convert-to-git' into...
blob
|
diff
|
raw
|
diff to current
2015-06-05
Merge branch 'jc/plug-fmt-merge-msg-leak' into maint
blob
|
diff
|
raw
|
diff to current
2015-06-05
Merge branch 'pt/xdg-config-path' into maint
blob
|
diff
|
raw
|
diff to current
2015-06-02
Merge branch 'pt/pull-tests' into pt/pull-optparse
blob
|
diff
|
raw
|
diff to current
2015-06-01
Merge branch 'sb/test-bitmap-free-at-end'
blob
|
diff
|
raw
|
diff to current
2015-06-01
Merge branch 'mm/rebase-i-post-rewrite-exec'
blob
|
diff
|
raw
|
diff to current
2015-06-01
Merge branch 'fm/fetch-raw-sha1'
blob
|
diff
|
raw
|
diff to current
2015-06-01
Merge branch 'sg/help-group'
blob
|
diff
|
raw
|
diff to current
2015-06-01
Merge branch 'mm/log-format-raw-doc'
blob
|
diff
|
raw
|
diff to current
2015-06-01
Merge branch 'dt/cat-file-follow-symlinks'
blob
|
diff
|
raw
|
diff to current
2015-06-01
Merge branch 'rs/janitorial'
blob
|
diff
|
raw
|
diff to current
2015-06-01
Merge branch 'jk/stash-options'
blob
|
diff
|
raw
|
diff to current
2015-06-01
Merge branch 'da/mergetool-winmerge'
blob
|
diff
|
raw
|
diff to current
2015-06-01
Merge branch 'mc/commit-doc-grammofix'
blob
|
diff
|
raw
|
diff to current
2015-06-01
Merge branch 'jh/filter-empty-contents'
blob
|
diff
|
raw
|
diff to current
2015-06-01
Merge branch 'ah/usage-strings'
blob
|
diff
|
raw
|
diff to current
2015-06-01
Merge branch 'jk/http-backend-deadlock'
blob
|
diff
|
raw
|
diff to current
2015-06-01
Merge branch 'dt/clean-pathspec-filter-then-lstat'
blob
|
diff
|
raw
|
diff to current
2015-05-27
Merge branch 'nd/untracked-cache'
blob
|
diff
|
raw
|
diff to current
2015-05-26
Sync with 2.4.2
blob
|
diff
|
raw
|
diff to current
2015-05-26
Merge branch 'jk/still-interesting' into maint
blob
|
diff
|
raw
|
diff to current
2015-05-26
Merge branch 'jc/hash-object' into maint
blob
|
diff
|
raw
|
diff to current
2015-05-26
Merge branch 'jk/rebase-quiet-noop' into maint
blob
|
diff
|
raw
|
diff to current
2015-05-26
Merge branch 'sg/complete-decorate-full-not-long' into...
blob
|
diff
|
raw
|
diff to current
2015-05-26
Merge branch 'jk/filter-branch-use-of-sed-on-incomplete...
blob
|
diff
|
raw
|
diff to current
2015-05-26
Merge branch 'jk/stash-require-clean-index' into maint
blob
|
diff
|
raw
|
diff to current
2015-05-26
Merge branch 'jk/git-no-more-argv0-path-munging' into...
blob
|
diff
|
raw
|
diff to current
2015-05-26
Merge branch 'nd/untracked-cache'
blob
|
diff
|
raw
|
diff to current
2015-05-26
Merge branch 'rs/plug-leak-in-pack-bitmaps'
blob
|
diff
|
raw
|
diff to current
2015-05-26
Merge branch 'pt/pull-ff-vs-merge-ff'
blob
|
diff
|
raw
|
diff to current
2015-05-26
Merge branch 'pt/pull-log-n'
blob
|
diff
|
raw
|
diff to current
2015-05-26
Merge branch 'jk/rerere-forget-check-enabled'
blob
|
diff
|
raw
|
diff to current
2015-05-26
Merge branch 'jk/http-backend-deadlock-2.3' into jk...
blob
|
diff
|
raw
|
diff to current
2015-05-26
Merge branch 'jk/http-backend-deadlock-2.2' into jk...
blob
|
diff
|
raw
|
diff to current
2015-05-22
Merge branch 'ps/doc-packfile-vs-pack-file'
blob
|
diff
|
raw
|
diff to current
2015-05-22
Merge branch 'sb/t1020-cleanup'
blob
|
diff
|
raw
|
diff to current
2015-05-22
Merge branch 'lm/squelch-bg-progress'
blob
|
diff
|
raw
|
diff to current
2015-05-22
Merge branch 'jc/ignore-epipe-in-filter'
blob
|
diff
|
raw
|
diff to current
2015-05-22
Merge branch 'mh/clone-verbosity-fix'
blob
|
diff
|
raw
|
diff to current
2015-05-22
Merge branch 'pt/pull-tags-error-diag'
blob
|
diff
|
raw
|
diff to current
2015-05-22
Merge branch 'mh/lockfile-retry'
blob
|
diff
|
raw
|
diff to current
2015-05-22
Merge branch 'jk/add-e-kill-editor'
blob
|
diff
|
raw
|
diff to current
2015-05-22
Merge branch 'sg/completion-config'
blob
|
diff
|
raw
|
diff to current
2015-05-22
Merge branch 'mh/ref-directory-file'
blob
|
diff
|
raw
|
diff to current
2015-05-22
Merge branch 'mh/write-refs-sooner-2.4'
blob
|
diff
|
raw
|
diff to current
next