Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first
⋅
prev
⋅
next
commit
grep
author
committer
pickaxe
?
re
Merge branch 'jc/test-sleepless'
[gitweb.git]
/
Documentation
/
git-merge.txt
2010-01-24
Merge branch 'maint'
blob
|
diff
|
raw
2010-01-24
Merge branch 'maint' of git://git.spearce.org/git-gui...
blob
|
diff
|
raw
|
diff to current
2010-01-24
Merge branch 'doc-style/for-next' of git://repo.or...
blob
|
diff
|
raw
2010-01-24
Documentation: merge: use MERGE_HEAD to refer to the...
blob
|
diff
|
raw
|
diff to current
2010-01-24
Documentation: simplify How Merge Works
blob
|
diff
|
raw
|
diff to current
2010-01-24
Documentation: merge: add a section about fast-forward
blob
|
diff
|
raw
|
diff to current
2010-01-24
Documentation: emphasize when git merge terminates...
blob
|
diff
|
raw
|
diff to current
2010-01-24
Documentation: merge: add an overview
blob
|
diff
|
raw
|
diff to current
2010-01-24
Documentation: merge: move merge strategy list to end
blob
|
diff
|
raw
|
diff to current
2010-01-24
Documentation: suggest `reset --merge` in How Merge...
blob
|
diff
|
raw
|
diff to current
2010-01-24
Documentation: merge: move configuration section to end
blob
|
diff
|
raw
|
diff to current
2010-01-23
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2010-01-23
Merge branch 'jc/branch-d'
blob
|
diff
|
raw
|
diff to current
2010-01-23
Merge branch 'il/rev-glob'
blob
|
diff
|
raw
|
diff to current
2010-01-23
Merge branch 'js/refer-upstream'
blob
|
diff
|
raw
|
diff to current
2010-01-23
Merge branch 'jl/submodule-diff'
blob
|
diff
|
raw
|
diff to current
2010-01-23
Merge branch 'il/remote-updates'
blob
|
diff
|
raw
|
diff to current
2010-01-23
Merge branch 'il/branch-set-upstream'
blob
|
diff
|
raw
|
diff to current
2010-01-23
Merge branch 'jc/maint-limit-note-output'
blob
|
diff
|
raw
|
diff to current
2010-01-23
Merge branch 'nd/ls-files-sparse-fix'
blob
|
diff
|
raw
|
diff to current
2010-01-22
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2010-01-21
Merge branch 'bw/cvsimport'
blob
|
diff
|
raw
|
diff to current
2010-01-21
Merge branch 'jc/checkout-merge-base'
blob
|
diff
|
raw
|
diff to current
2010-01-21
Merge branch 'ag/patch-header-verify'
blob
|
diff
|
raw
|
diff to current
2010-01-21
Merge branch 'jc/conflict-marker-size'
blob
|
diff
|
raw
|
diff to current
2010-01-21
Merge branch 'ag/maint-apply-too-large-p'
blob
|
diff
|
raw
|
diff to current
2010-01-21
Merge branch 'ap/merge-backend-opts'
blob
|
diff
|
raw
|
diff to current
2010-01-21
Merge branch 'nd/status-partial-refresh'
blob
|
diff
|
raw
|
diff to current
2010-01-21
Merge remote branch 'remotes/trast-doc/for-next'
blob
|
diff
|
raw
|
diff to current
2010-01-21
Merge branch 'jh/notes' (early part)
blob
|
diff
|
raw
|
diff to current
2010-01-21
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2010-01-20
Merge branch 'rr/core-tutorial'
blob
|
diff
|
raw
|
diff to current
2010-01-20
Merge branch 'jc/cache-unmerge'
blob
|
diff
|
raw
|
diff to current
2010-01-20
Merge branch 'js/exec-error-report'
blob
|
diff
|
raw
|
diff to current
2010-01-20
Merge branch 'jc/ls-files-ignored-pathspec'
blob
|
diff
|
raw
|
diff to current
2010-01-20
Merge branch 'jc/grep-lookahead'
blob
|
diff
|
raw
|
diff to current
2010-01-20
Merge branch 'jc/maint-strbuf-add-fix-doubling'
blob
|
diff
|
raw
|
diff to current
2010-01-20
Merge branch 'mm/conflict-advice'
blob
|
diff
|
raw
|
diff to current
2010-01-20
Merge branch 'da/difftool'
blob
|
diff
|
raw
|
diff to current
2010-01-20
Merge branch 'mh/rebase-fixup'
blob
|
diff
|
raw
|
diff to current
2010-01-20
Merge branch 'ns/rebase-auto-squash'
blob
|
diff
|
raw
|
diff to current
2010-01-20
Merge branch 'mh/rebase-fixup' (early part)
blob
|
diff
|
raw
|
diff to current
2010-01-20
Merge branch 'il/push-set-upstream'
blob
|
diff
|
raw
|
diff to current
2010-01-20
Merge branch 'jk/warn-author-committer-after-commit'
blob
|
diff
|
raw
|
diff to current
2010-01-20
Merge branch 'jc/ident'
blob
|
diff
|
raw
|
diff to current
2010-01-20
Merge branch 'tr/http-push-ref-status'
blob
|
diff
|
raw
|
diff to current
2010-01-20
Merge branch 'bk/fix-relative-gitdir-file'
blob
|
diff
|
raw
|
diff to current
2010-01-20
Merge branch 'sd/cd-p-show-toplevel'
blob
|
diff
|
raw
|
diff to current
2010-01-20
Merge branch 'jc/symbol-static'
blob
|
diff
|
raw
|
diff to current
2010-01-20
Sync with 1.6.6.1
blob
|
diff
|
raw
|
diff to current
2010-01-20
Merge branch 'bg/maint-remote-update-default' into...
blob
|
diff
|
raw
|
diff to current
2010-01-20
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2010-01-19
Merge branch 'maint-1.6.4' into maint-1.6.5
blob
|
diff
|
raw
|
diff to current
2010-01-19
Merge branch 'maint-1.6.2' into maint-1.6.3
blob
|
diff
|
raw
|
diff to current
2010-01-19
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2010-01-19
Merge branch 'jc/rerere'
blob
|
diff
|
raw
|
diff to current
2010-01-17
Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge'
blob
|
diff
|
raw
|
diff to current
2010-01-13
Merge branch 'jc/checkout-merge-base'
blob
|
diff
|
raw
|
diff to current
2010-01-13
Merge branch 'nd/sparse'
blob
|
diff
|
raw
|
diff to current
2010-01-12
Merge branch 'jc/maint-1.6.4-grep-lookahead' into jc...
blob
|
diff
|
raw
|
diff to current
2010-01-10
Merge branch 'bg/maint-remote-update-default'
blob
|
diff
|
raw
|
diff to current
2010-01-10
Documentation: spell 'git cmd' without dash throughout
blob
|
diff
|
raw
|
diff to current
2010-01-10
Documentation: format full commands in typewriter font
blob
|
diff
|
raw
|
diff to current
2010-01-10
Merge branch 'maint-1.6.2' into maint
blob
|
diff
|
raw
|
diff to current
2010-01-10
Merge branch 'maint-1.6.0' into maint-1.6.1
blob
|
diff
|
raw
|
diff to current
2010-01-09
Documentation: warn prominently against merging with...
blob
|
diff
|
raw
|
diff to current
2010-01-09
Documentation/git-merge: reword references to "remote...
blob
|
diff
|
raw
|
diff to current
2009-12-31
Merge branch 'maint-1.6.0' into maint
blob
|
diff
|
raw
|
diff to current
2009-12-30
Merge branch 'maint-1.6.1' into maint
blob
|
diff
|
raw
|
diff to current
2009-12-30
Merge branch 'maint-1.6.0' into maint-1.6.1
blob
|
diff
|
raw
|
diff to current
2009-12-28
Merge branch 'jk/1.7.0-status'
blob
|
diff
|
raw
|
diff to current
2009-12-27
Merge branch 'nf/maint-fix-index-ext-len-on-be64' into...
blob
|
diff
|
raw
|
diff to current
2009-12-26
Merge branch 'jc/1.7.0-diff-whitespace-only-status'
blob
|
diff
|
raw
|
diff to current
2009-12-26
Merge branch 'jc/1.7.0-push-safety'
blob
|
diff
|
raw
|
diff to current
2009-12-26
Merge branch 'jc/1.7.0-send-email-no-thread-default'
blob
|
diff
|
raw
|
diff to current
2009-12-26
Merge branch 'sr/vcs-helper'
blob
|
diff
|
raw
|
diff to current
2009-12-09
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2009-12-09
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
|
diff to current
2009-12-09
Merge branch 'mm/maint-merge-ff-error-message-fix'...
blob
|
diff
|
raw
|
diff to current
2009-12-09
Merge branch 'jk/maint-add-p-delete-fix' into maint
blob
|
diff
|
raw
|
diff to current
2009-12-07
Merge branch 'master' into il/vcs-helper
blob
|
diff
|
raw
|
diff to current
2009-12-04
Teach --[no-]rerere-autoupdate option to merge, revert...
blob
|
diff
|
raw
|
diff to current
2009-12-03
Merge branch 'uk/maint-shortlog-encoding' into maint
blob
|
diff
|
raw
|
diff to current
2009-12-03
Merge branch 'fc/maint-format-patch-pathspec-dashes...
blob
|
diff
|
raw
|
diff to current
2009-12-03
Merge branch 'ap/maint-merge-strategy-list-fix' into...
blob
|
diff
|
raw
|
diff to current
2009-12-03
Merge branch 'jc/maint-am-keep' into maint
blob
|
diff
|
raw
|
diff to current
2009-12-03
Merge branch 'rs/work-around-grep-opt-insanity' into...
blob
|
diff
|
raw
|
diff to current
2009-12-03
Merge branch 'rj/maint-cygwin-count-objects' into maint
blob
|
diff
|
raw
|
diff to current
2009-12-03
Merge branch 'mm/maint-hint-failed-merge' into maint
blob
|
diff
|
raw
|
diff to current
2009-12-03
Merge branch 'th/maint-remote-update-help-string' into...
blob
|
diff
|
raw
|
diff to current
2009-12-03
Merge branch 'rj/maint-t9700' into maint
blob
|
diff
|
raw
|
diff to current
2009-12-03
Merge branch 'ls/maint-mailinfo-no-inbody' into maint
blob
|
diff
|
raw
|
diff to current
2009-12-03
Merge branch 'mo/maint-crlf-doc' into maint
blob
|
diff
|
raw
|
diff to current
2009-12-03
Merge branch 'th/remote-usage' into maint
blob
|
diff
|
raw
|
diff to current
2009-12-03
Merge branch 'pb/maint-use-custom-perl' into maint
blob
|
diff
|
raw
|
diff to current
2009-12-03
Merge branch 'mm/config-pathname-tilde-expand' into...
blob
|
diff
|
raw
|
diff to current
2009-12-03
Merge branch 'bc/grep-i-F' into maint
blob
|
diff
|
raw
|
diff to current
2009-12-03
Merge branch 'jk/maint-break-rename-reduce-memory'...
blob
|
diff
|
raw
|
diff to current
2009-12-03
Merge branch 'rj/maint-simplify-cygwin-makefile' into...
blob
|
diff
|
raw
|
diff to current
2009-12-03
Merge branch 'rg/doc-workflow' into maint
blob
|
diff
|
raw
|
diff to current
next