Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅
next
commit
grep
author
committer
pickaxe
?
re
Merge branch 'bp/mediawiki-preview'
[gitweb.git]
/
Documentation
/
merge-options.txt
2013-07-18
Merge branch 'es/overlapping-range-set'
blob
|
diff
|
raw
2013-07-18
Merge branch 'jk/maint-clone-shared-no-connectivity...
blob
|
diff
|
raw
2013-07-18
Merge branch 'bc/push-match-many-refs'
blob
|
diff
|
raw
2013-07-18
Merge branch 'rr/rebase-reflog-message-reword'
blob
|
diff
|
raw
2013-07-15
Merge branch 'tr/maint-apply-non-git-patch-parsefix...
blob
|
diff
|
raw
2013-07-15
Merge branch 'bc/http-keep-memory-given-to-curl' into...
blob
|
diff
|
raw
2013-07-15
Merge branch 'jk/pull-into-dirty-unborn' into maint
blob
|
diff
|
raw
2013-07-15
Merge branch 'fg/submodule-non-ascii-path' into maint
blob
|
diff
|
raw
2013-07-15
Merge branch 'fc/sequencer-plug-leak' into maint
blob
|
diff
|
raw
2013-07-15
Merge branch 'mt/send-email-cc-match-fix' into maint
blob
|
diff
|
raw
2013-07-15
Merge branch 'fg/submodule-clone-depth'
blob
|
diff
|
raw
2013-07-12
Merge branch 'rs/pickaxe-simplify'
blob
|
diff
|
raw
2013-07-12
Merge branch 'rr/name-rev-stdin-doc'
blob
|
diff
|
raw
2013-07-12
Merge branch 'ft/diff-rename-default-score-is-half'
blob
|
diff
|
raw
2013-07-12
Merge branch 'ms/remote-tracking-branches-in-doc'
blob
|
diff
|
raw
2013-07-12
Merge branch 'jk/pull-to-integrate'
blob
|
diff
|
raw
2013-07-12
Merge branch 'jk/maint-config-multi-order'
blob
|
diff
|
raw
2013-07-12
Merge branch 'as/log-output-encoding-in-user-format'
blob
|
diff
|
raw
2013-07-11
Merge branch 'jc/t1512-fix'
blob
|
diff
|
raw
2013-07-11
Merge branch 'tr/test-v-and-v-subtest-only'
blob
|
diff
|
raw
2013-07-11
Merge branch 'jc/maint-diff-core-safecrlf'
blob
|
diff
|
raw
2013-07-11
Merge branch 'jg/status-config'
blob
|
diff
|
raw
2013-07-11
Merge branch 'rr/rebase-checkout-reflog'
blob
|
diff
|
raw
2013-07-11
Merge branch 'mh/maint-lockfile-overflow'
blob
|
diff
|
raw
2013-07-05
Merge branch 'tr/test-v-and-v-subtest-only'
blob
|
diff
|
raw
2013-07-03
Merge branch 'rr/diffcore-pickaxe-doc' into maint
blob
|
diff
|
raw
2013-07-03
Merge branch 'cr/git-work-tree-sans-git-dir' into maint
blob
|
diff
|
raw
2013-07-03
Merge branch 'fc/do-not-use-the-index-in-add-to-index...
blob
|
diff
|
raw
2013-07-03
Merge branch 'dm/unbash-subtree' into maint
blob
|
diff
|
raw
2013-07-03
Merge branch 'jc/core-checkstat' into maint
blob
|
diff
|
raw
2013-07-03
Merge branch 'jc/t5551-posix-sed-bre' into maint
blob
|
diff
|
raw
2013-07-03
Merge branch 'vv/help-unknown-ref' into maint
blob
|
diff
|
raw
2013-07-03
Merge branch 'rs/empty-archive' into maint
blob
|
diff
|
raw
2013-07-03
Merge branch 'rh/merge-options-doc-fix' into maint
blob
|
diff
|
raw
2013-07-03
Merge branch 'an/diff-index-doc' into maint
blob
|
diff
|
raw
|
diff to current
2013-07-03
Merge branch 'cb/log-follow-with-combined' into maint
blob
|
diff
|
raw
|
diff to current
2013-07-03
Merge branch 'maint-1.8.2' into maint
blob
|
diff
|
raw
|
diff to current
2013-07-01
Merge branch 'maint'
blob
|
diff
|
raw
2013-07-01
Merge branch 'rr/column-doc'
blob
|
diff
|
raw
2013-07-01
Merge branch 'ft/doc-git-transport'
blob
|
diff
|
raw
2013-07-01
Merge branch 'jc/topo-author-date-sort'
blob
|
diff
|
raw
2013-07-01
Merge branch 'jk/commit-info-slab'
blob
|
diff
|
raw
2013-06-30
Merge branch 'maint'
blob
|
diff
|
raw
2013-06-30
Merge branch 'ap/diff-ignore-blank-lines'
blob
|
diff
|
raw
2013-06-30
Merge branch 'nk/name-rev-abbreviated-refs'
blob
|
diff
|
raw
2013-06-30
Merge branch 'jk/submodule-subdirectory-ok'
blob
|
diff
|
raw
2013-06-30
Merge branch 'fc/macos-x-clipped-write' into maint
blob
|
diff
|
raw
|
diff to current
2013-06-28
Sync with 1.8.3.2
blob
|
diff
|
raw
2013-06-27
Merge branch 'maint'
blob
|
diff
|
raw
2013-06-27
Merge branch 'tg/maint-zsh-svn-remote-prompt' into...
blob
|
diff
|
raw
|
diff to current
2013-06-27
Merge branch 'nd/urls-doc-no-file-hyperlink-fix' into...
blob
|
diff
|
raw
|
diff to current
2013-06-27
Merge branch 'tr/push-no-verify-doc' into maint
blob
|
diff
|
raw
|
diff to current
2013-06-27
Merge branch 'rs/commit-m-no-edit' into maint
blob
|
diff
|
raw
|
diff to current
2013-06-27
Merge branch 'mk/combine-diff-context-horizon-fix'...
blob
|
diff
|
raw
|
diff to current
2013-06-27
Merge branch 'jk/subtree-do-not-push-if-split-fails...
blob
|
diff
|
raw
|
diff to current
2013-06-27
Merge branch 'jk/add-i-custom-diff-algo'
blob
|
diff
|
raw
2013-06-27
Merge branch 'mt/send-email-cc-match-fix'
blob
|
diff
|
raw
2013-06-27
Merge branch 'jk/pull-into-dirty-unborn'
blob
|
diff
|
raw
2013-06-27
Merge branch 'bc/http-keep-memory-given-to-curl'
blob
|
diff
|
raw
2013-06-27
Merge branch 'bc/checkout-tracking-name-plug-leak'
blob
|
diff
|
raw
2013-06-27
Merge branch 'rr/rebase-stash-store'
blob
|
diff
|
raw
2013-06-26
Merge branch 'tr/maint-apply-non-git-patch-parsefix'
blob
|
diff
|
raw
2013-06-26
Merge branch 'ys/cygstart'
blob
|
diff
|
raw
2013-06-26
Merge branch 'wk/doc-git-has-grown'
blob
|
diff
|
raw
2013-06-26
Merge branch 'vl/typofix'
blob
|
diff
|
raw
2013-06-26
Merge branch 'ph/builtin-srcs-are-in-subdir-these-days'
blob
|
diff
|
raw
2013-06-26
Merge branch 'mm/merge-in-dirty-worktree-doc'
blob
|
diff
|
raw
2013-06-26
Merge branch 'kb/diff-blob-blob-doc'
blob
|
diff
|
raw
2013-06-26
Merge branch 'mm/push-force-is-dangerous'
blob
|
diff
|
raw
2013-06-26
Merge branch 'fg/submodule-non-ascii-path'
blob
|
diff
|
raw
2013-06-24
Merge branch 'rr/am-quit-empty-then-abort-fix'
blob
|
diff
|
raw
2013-06-24
Merge branch 'rt/cherry-pick-continue-advice-in-status'
blob
|
diff
|
raw
2013-06-24
Merge branch 'nk/config-local-doc'
blob
|
diff
|
raw
2013-06-24
Merge branch 'jk/mergetool-lib-refactor'
blob
|
diff
|
raw
2013-06-24
Merge branch 'jk/doc-build-move-infordir-def'
blob
|
diff
|
raw
2013-06-24
Merge branch 'dk/version-gen-gitdir'
blob
|
diff
|
raw
2013-06-24
Merge branch 'dk/maint-t5150-dirname'
blob
|
diff
|
raw
2013-06-24
Merge branch 'rs/unpack-trees-tree-walk-conflict-field'
blob
|
diff
|
raw
2013-06-24
Merge branch 'mm/rm-coalesce-errors'
blob
|
diff
|
raw
2013-06-24
Merge branch 'jh/libify-note-handling'
blob
|
diff
|
raw
2013-06-24
Merge branch 'fc/sequencer-plug-leak'
blob
|
diff
|
raw
2013-06-23
Merge branch 'mz/rebase-tests'
blob
|
diff
|
raw
2013-06-23
Merge branch 'jk/unpack-entry-fallback-to-another'
blob
|
diff
|
raw
2013-06-23
Merge branch 'jk/apache-test-for-2.4'
blob
|
diff
|
raw
2013-06-23
Merge branch 'rr/rebase-autostash'
blob
|
diff
|
raw
2013-06-23
Merge branch 'jg/status-config'
blob
|
diff
|
raw
2013-06-21
Sync with maint
blob
|
diff
|
raw
2013-06-20
Merge branch 'cm/remote-mediawiki'
blob
|
diff
|
raw
2013-06-20
Merge branch 'rs/match-trees-refactor'
blob
|
diff
|
raw
2013-06-20
Merge branch 'rs/logical-vs-binary-or'
blob
|
diff
|
raw
2013-06-20
Merge branch 'mm/color-auto-default'
blob
|
diff
|
raw
2013-06-20
Merge branch 'rs/discard-index-discard-array'
blob
|
diff
|
raw
2013-06-20
Merge branch 'nd/traces'
blob
|
diff
|
raw
2013-06-20
Merge branch 'fc/show-non-empty-errors-in-test'
blob
|
diff
|
raw
2013-06-20
Merge branch 'fc/makefile'
blob
|
diff
|
raw
2013-06-20
Merge branch 'js/test-ln-s-add'
blob
|
diff
|
raw
2013-06-20
Merge branch 'nd/make-wildmatch-default'
blob
|
diff
|
raw
2013-06-17
Merge tag 'gitgui-0.18.0' of git://repo.or.cz/git-gui
blob
|
diff
|
raw
2013-06-14
Merge branch 'rr/complete-difftool-fixup'
blob
|
diff
|
raw
2013-06-14
Merge branch 'mt/send-email-cc-match-fix'
blob
|
diff
|
raw
next