tokkee.org
Code
projects
/
git.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Merge branch 'rr/remote-helper-doc'
[git.git]
/
Documentation
/
git-merge.txt
2010-04-19
Junio C Hamano
Merge branch 'rr/remote-helper-doc'
blob
|
commitdiff
|
raw
2010-04-19
Junio C Hamano
Merge branch 'jk/maint-diffstat-overflow'
blob
|
commitdiff
|
raw
2010-04-19
Junio C Hamano
Merge branch 'jg/auto-initialize-notes-with-percent...
blob
|
commitdiff
|
raw
2010-04-19
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
2010-04-14
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2010-04-12
Marc Branchaud
Docs: Add -X option to git-merge's synopsis.
blob
|
commitdiff
|
raw
2010-04-11
Junio C Hamano
Merge branch 'rc/maint-reflog-msg-for-forced-branch...
blob
|
commitdiff
|
raw
|
diff to current
2010-04-10
Junio C Hamano
Merge branch 'jc/conflict-marker-size' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-04-10
Junio C Hamano
Merge branch 'mg/maint-send-email-lazy-editor' into...
blob
|
commitdiff
|
raw
|
diff to current
2010-04-10
Junio C Hamano
Merge branch 'rc/maint-reflog-msg-for-forced-branch'
blob
|
commitdiff
|
raw
|
diff to current
2010-04-06
Junio C Hamano
Merge branch 'jc/conflict-marker-size'
blob
|
commitdiff
|
raw
|
diff to current
2010-04-03
Junio C Hamano
Merge branch 'mg/maint-send-email-lazy-editor'
blob
|
commitdiff
|
raw
|
diff to current
2010-03-31
Junio C Hamano
Merge branch 'jc/maint-refs-dangling' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-03-29
Junio C Hamano
Merge branch 'sb/notes-parse-opt'
blob
|
commitdiff
|
raw
|
diff to current
2010-03-29
Junio C Hamano
Merge branch 'cp/add-u-pathspec' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-03-24
Junio C Hamano
Merge branch 'tr/notes-display'
blob
|
commitdiff
|
raw
|
diff to current
2010-03-24
Junio C Hamano
Merge branch 'jc/maint-refs-dangling'
blob
|
commitdiff
|
raw
|
diff to current
2010-03-24
Junio C Hamano
Merge branch 'jc/color-attrs' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-03-24
Junio C Hamano
Merge branch 'jk/maint-add-ignored-dir' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-03-22
Junio C Hamano
Merge branch 'maint-1.6.6' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-03-20
Junio C Hamano
Merge branch 'jk/maint-add-ignored-dir'
blob
|
commitdiff
|
raw
|
diff to current
2010-03-20
Junio C Hamano
Merge branch 'jc/color-attrs'
blob
|
commitdiff
|
raw
|
diff to current
2010-03-15
Junio C Hamano
Merge branch 'jh/notes'
blob
|
commitdiff
|
raw
|
diff to current
2010-03-10
Junio C Hamano
Merge branch 'cp/add-u-pathspec'
blob
|
commitdiff
|
raw
|
diff to current
2010-03-08
Junio C Hamano
Merge branch 'fn/maint-mkdtemp-compat' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-03-08
Junio C Hamano
Merge branch 'jk/maint-push-tracking-wo-remote' into...
blob
|
commitdiff
|
raw
|
diff to current
2010-03-08
Junio C Hamano
Merge branch 'jk/maint-add--interactive-delete' into...
blob
|
commitdiff
|
raw
|
diff to current
2010-03-08
Junio C Hamano
Merge branch 'jc/grep-author-all-match-implicit' into...
blob
|
commitdiff
|
raw
|
diff to current
2010-03-08
Junio C Hamano
Merge branch 'maint-1.6.6' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-03-07
Junio C Hamano
Merge branch 'jc/maint-fix-test-perm' into maint-1.6.6
blob
|
commitdiff
|
raw
|
diff to current
2010-03-07
Junio C Hamano
Merge branch 'gf/maint-sh-setup-nongit-ok' into maint...
blob
|
commitdiff
|
raw
|
diff to current
2010-03-07
Junio C Hamano
Merge branch 'jk/maint-rmdir-fix' into maint-1.6.6
blob
|
commitdiff
|
raw
|
diff to current
2010-03-07
Junio C Hamano
Merge branch 'tr/maint-cherry-pick-list' into maint...
blob
|
commitdiff
|
raw
|
diff to current
2010-03-07
Junio C Hamano
Merge branch 'fn/maint-mkdtemp-compat'
blob
|
commitdiff
|
raw
|
diff to current
2010-03-07
Junio C Hamano
Merge branch 'jk/maint-push-tracking-wo-remote'
blob
|
commitdiff
|
raw
|
diff to current
2010-03-07
Junio C Hamano
Merge branch 'nd/root-git'
blob
|
commitdiff
|
raw
|
diff to current
2010-03-07
Junio C Hamano
Merge branch 'jk/maint-add--interactive-delete'
blob
|
commitdiff
|
raw
|
diff to current
2010-03-05
Junio C Hamano
Merge branch 'tr/maint-cherry-pick-list' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-03-05
Junio C Hamano
Merge branch 'rs/optim-text-wrap' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-03-05
Junio C Hamano
Merge branch 'gf/maint-sh-setup-nongit-ok' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-03-05
Junio C Hamano
Merge branch 'cc/maint-bisect-paths' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-03-05
Junio C Hamano
Merge branch 'maint-1.6.6' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-03-03
Junio C Hamano
Merge branch 'hm/maint-imap-send-crlf' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-03-03
Junio C Hamano
Merge branch 'sp/maint-push-sideband' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-03-03
Junio C Hamano
Merge branch 'jc/maint-fix-test-perm' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-03-02
Junio C Hamano
Merge branch 'tr/maint-cherry-pick-list'
blob
|
commitdiff
|
raw
|
diff to current
2010-03-02
Junio C Hamano
Merge branch 'rs/optim-text-wrap'
blob
|
commitdiff
|
raw
|
diff to current
2010-03-02
Junio C Hamano
Merge branch 'gf/maint-sh-setup-nongit-ok'
blob
|
commitdiff
|
raw
|
diff to current
2010-03-02
Junio C Hamano
Merge branch 'jc/grep-author-all-match-implicit'
blob
|
commitdiff
|
raw
|
diff to current
2010-03-01
Junio C Hamano
Merge branch 'cc/maint-bisect-paths'
blob
|
commitdiff
|
raw
|
diff to current
2010-02-26
Junio C Hamano
Merge branch 'maint-1.6.6' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-02-24
Junio C Hamano
Merge branch 'ml/maint-grep-doc' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-02-23
Junio C Hamano
Merge branch 'il/rev-glob'
blob
|
commitdiff
|
raw
|
diff to current
2010-02-21
Junio C Hamano
Merge branch 'ml/maint-grep-doc'
blob
|
commitdiff
|
raw
|
diff to current
2010-02-21
Junio C Hamano
Merge branch 'hm/maint-imap-send-crlf'
blob
|
commitdiff
|
raw
|
diff to current
2010-02-21
Junio C Hamano
Merge branch 'jc/maint-fix-test-perm'
blob
|
commitdiff
|
raw
|
diff to current
2010-02-19
Junio C Hamano
Merge branch 'jk/maint-rmdir-fix' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-02-16
Junio C Hamano
Merge branch 'maint-1.6.6' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-02-15
Junio C Hamano
Merge branch 'maint-1.6.6' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-02-12
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2010-02-12
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2010-02-10
Junio C Hamano
Sync with 1.6.6.2
blob
|
commitdiff
|
raw
|
diff to current
2010-02-10
Junio C Hamano
Merge branch 'jh/maint-config-file-prefix' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-02-10
Junio C Hamano
Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge...
blob
|
commitdiff
|
raw
|
diff to current
2010-02-10
Junio C Hamano
Merge branch 'sp/maint-push-sideband' into sp/push...
blob
|
commitdiff
|
raw
|
diff to current
2010-02-09
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2010-02-09
Junio C Hamano
Merge branch 'jc/maint-push-doc-status' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-02-08
Junio C Hamano
Merge branch 'jc/maint-imap-config-parse' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-02-08
Junio C Hamano
Merge branch 'jc/maint-doc-git-add-example' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-02-07
Junio C Hamano
Merge git://repo.or.cz/git-gui
v1.7.0-rc2
blob
|
commitdiff
|
raw
|
diff to current
2010-02-07
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2010-02-06
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2010-02-06
Junio C Hamano
Merge branch 'sp/maint-push-sideband' into sp/push...
blob
|
commitdiff
|
raw
|
diff to current
2010-02-06
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2010-02-01
Junio C Hamano
Merge branch 'sp/maint-fast-import-large-blob' into...
blob
|
commitdiff
|
raw
|
diff to current
2010-01-31
Junio C Hamano
Merge commit 'b319ef7' into jc/maint-fix-test-perm
blob
|
commitdiff
|
raw
|
diff to current
2010-01-30
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2010-01-29
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2010-01-28
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2010-01-28
Junio C Hamano
Merge branch 'gp/maint-cvsserver'
blob
|
commitdiff
|
raw
|
diff to current
2010-01-27
Junio C Hamano
Merge branch 'jc/maint-reflog-bad-timestamp'
blob
|
commitdiff
|
raw
|
diff to current
2010-01-27
Junio C Hamano
Merge branch 'il/maint-colon-address'
blob
|
commitdiff
|
raw
|
diff to current
2010-01-27
Junio C Hamano
Merge branch 'il/maint-xmallocz'
blob
|
commitdiff
|
raw
|
diff to current
2010-01-27
Junio C Hamano
Merge branch 'jh/maint-config-file-prefix'
blob
|
commitdiff
|
raw
|
diff to current
2010-01-27
Junio C Hamano
Merge branch 'jl/diff-submodule-ignore'
blob
|
commitdiff
|
raw
|
diff to current
2010-01-26
Jonathan Nieder
Merge branch 'master' of git://repo.or.cz/alt-git into...
blob
|
commitdiff
|
raw
|
diff to current
2010-01-25
Junio C Hamano
Merge branch 'jc/fix-tree-walk'
blob
|
commitdiff
|
raw
|
diff to current
2010-01-24
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2010-01-24
Junio C Hamano
Merge branch 'maint' of git://git.spearce.org/git-gui...
blob
|
commitdiff
|
raw
|
diff to current
2010-01-24
Junio C Hamano
Merge branch 'doc-style/for-next' of git://repo.or...
blob
|
commitdiff
|
raw
|
diff to current
2010-01-24
Jonathan Nieder
Documentation: merge: use MERGE_HEAD to refer to the...
blob
|
commitdiff
|
raw
|
diff to current
2010-01-24
Jonathan Nieder
Documentation: simplify How Merge Works
blob
|
commitdiff
|
raw
|
diff to current
2010-01-24
Jonathan Nieder
Documentation: merge: add a section about fast-forward
blob
|
commitdiff
|
raw
|
diff to current
2010-01-24
Jonathan Nieder
Documentation: emphasize when git merge terminates...
blob
|
commitdiff
|
raw
|
diff to current
2010-01-24
Jonathan Nieder
Documentation: merge: add an overview
blob
|
commitdiff
|
raw
|
diff to current
2010-01-24
Jonathan Nieder
Documentation: merge: move merge strategy list to end
blob
|
commitdiff
|
raw
|
diff to current
2010-01-24
Jonathan Nieder
Documentation: suggest `reset --merge` in How Merge...
blob
|
commitdiff
|
raw
|
diff to current
2010-01-24
Jonathan Nieder
Documentation: merge: move configuration section to end
blob
|
commitdiff
|
raw
|
diff to current
2010-01-23
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2010-01-23
Junio C Hamano
Merge branch 'jc/branch-d'
blob
|
commitdiff
|
raw
|
diff to current
next
![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
