tokkee.org
Code
projects
/
git.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Documentation/diff-options: reword description of --submodule option
[git.git]
/
Documentation
/
merge-options.txt
2009-09-21
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
2009-09-16
Junio C Hamano
Merge branch 'tf/diff-whitespace-incomplete-line' into...
blob
|
commitdiff
|
raw
2009-09-03
Junio C Hamano
Merge branch 'maint-1.6.2' into maint-1.6.3
blob
|
commitdiff
|
raw
2009-09-03
Junio C Hamano
Merge branch 'maint-1.6.2' into maint-1.6.3
blob
|
commitdiff
|
raw
2009-09-01
Junio C Hamano
Merge branch 'tf/diff-whitespace-incomplete-line'
blob
|
commitdiff
|
raw
2009-08-28
Junio C Hamano
Merge branch 'maint-1.6.2' into maint-1.6.3
blob
|
commitdiff
|
raw
2009-08-28
Junio C Hamano
Merge branch 'maint-1.6.0' into maint-1.6.1
blob
|
commitdiff
|
raw
|
diff to current
2009-08-28
Junio C Hamano
Merge branch 'maint-1.5.6' into maint-1.6.0
blob
|
commitdiff
|
raw
|
diff to current
2009-08-26
Junio C Hamano
Merge branch 'tr/maint-1.6.3-add-p-modeonly-fix' into...
blob
|
commitdiff
|
raw
2009-08-21
Junio C Hamano
Merge branch 'jc/maint-merge-recursive-fix' into maint
blob
|
commitdiff
|
raw
2009-08-19
Junio C Hamano
Merge branch 'tr/maint-1.6.3-add-p-modeonly-fix'
blob
|
commitdiff
|
raw
2009-08-16
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
2009-08-11
Junio C Hamano
Merge branch 'jc/maint-merge-recursive-fix'
blob
|
commitdiff
|
raw
2009-08-08
Junio C Hamano
Merge branch 'maint-1.6.2' into maint-1.6.3
blob
|
commitdiff
|
raw
2009-08-08
Junio C Hamano
Merge branch 'maint-1.6.0' into maint-1.6.1
blob
|
commitdiff
|
raw
|
diff to current
2009-07-29
Junio C Hamano
Merge branch 'hv/cvsps-tests'
blob
|
commitdiff
|
raw
2009-07-02
Junio C Hamano
Merge branch 'cc/bisect'
blob
|
commitdiff
|
raw
2009-07-02
Junio C Hamano
Merge branch 'ne/maint-1.6.0-diff-tree-t-r-show-directory'
blob
|
commitdiff
|
raw
2009-06-22
Junio C Hamano
Merge branch 'sb/maint-1.6.0-add-config-fix' into maint
blob
|
commitdiff
|
raw
2009-06-22
Junio C Hamano
Merge branch 'rc/maint-http-local-slot-fix' into maint
blob
|
commitdiff
|
raw
2009-06-22
Junio C Hamano
Merge branch 'pb/maint-1.6.2-userdiff-fix' into maint
blob
|
commitdiff
|
raw
2009-06-21
Junio C Hamano
Merge branch 'maint-1.6.2' into maint
blob
|
commitdiff
|
raw
2009-06-21
Junio C Hamano
Merge branch 'maint-1.6.0' into maint-1.6.1
blob
|
commitdiff
|
raw
|
diff to current
2009-06-21
Junio C Hamano
Merge branch 'ph/submodule-rebase'
blob
|
commitdiff
|
raw
2009-06-21
Junio C Hamano
Merge branch 'jc/cache-tree'
blob
|
commitdiff
|
raw
2009-06-21
Junio C Hamano
Merge branch 'pb/maint-1.6.2-userdiff-fix'
blob
|
commitdiff
|
raw
2009-06-21
Junio C Hamano
Merge branch 'sb/maint-1.6.0-add-config-fix'
blob
|
commitdiff
|
raw
2009-06-20
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
2009-06-14
Junio C Hamano
Merge branch 'maint-1.6.2' into maint
blob
|
commitdiff
|
raw
2009-06-14
Junio C Hamano
Merge branch 'maint-1.6.0' into maint-1.6.1
blob
|
commitdiff
|
raw
|
diff to current
2009-06-13
Junio C Hamano
Merge branch 'rc/http-push'
blob
|
commitdiff
|
raw
2009-06-13
Junio C Hamano
Merge branch 'cc/bisect' (early part)
blob
|
commitdiff
|
raw
2009-06-13
Junio C Hamano
Merge branch 'rc/maint-http-local-slot-fix'
blob
|
commitdiff
|
raw
2009-06-13
Junio C Hamano
Merge branch 'ph/submodule-rebase' (early part)
blob
|
commitdiff
|
raw
2009-06-13
Junio C Hamano
Merge branch 'da/araxis-mergetool'
blob
|
commitdiff
|
raw
2009-06-11
Junio C Hamano
Merge branch 'uk/maint-1.5.3-rebase-i-reflog' into...
blob
|
commitdiff
|
raw
2009-06-02
Junio C Hamano
Merge branch 'cb/maint-1.6.0-xdl-merge-fix' into maint
blob
|
commitdiff
|
raw
2009-06-02
Junio C Hamano
Merge branch 'rs/maint-grep-word-regexp-fix' into maint
blob
|
commitdiff
|
raw
2009-06-02
Junio C Hamano
Merge branch 'sb/maint-1.6.2-opt-filename-fix' into...
blob
|
commitdiff
|
raw
2009-06-02
Junio C Hamano
Merge branch 'jc/maint-add-p-coalesce-fix' into maint
blob
|
commitdiff
|
raw
2009-05-31
Junio C Hamano
Merge branch 'sb/opt-filename'
blob
|
commitdiff
|
raw
2009-05-31
Junio C Hamano
Merge branch 'jc/solaris-0811'
blob
|
commitdiff
|
raw
2009-05-31
Junio C Hamano
Merge branch 'sb/show-branch-parse-options'
blob
|
commitdiff
|
raw
2009-05-31
Junio C Hamano
Merge branch 'mm/apply-double-slash'
blob
|
commitdiff
|
raw
2009-05-31
Junio C Hamano
Merge branch 'sb/format-patch-parseopt'
blob
|
commitdiff
|
raw
2009-05-31
Junio C Hamano
Merge branch 'jc/mktree'
blob
|
commitdiff
|
raw
2009-05-31
Junio C Hamano
Merge branch 'mw/send-email'
blob
|
commitdiff
|
raw
2009-05-31
Junio C Hamano
Merge branch 'cc/bisect' (early part)
blob
|
commitdiff
|
raw
2009-05-31
Eric Wong
t9139 uses ancient, backwards-compatible iconv names
blob
|
commitdiff
|
raw
2009-05-29
Junio C Hamano
Merge branch 'sb/maint-1.6.2-opt-filename-fix'
blob
|
commitdiff
|
raw
2009-05-29
Junio C Hamano
Merge branch 'jc/maint-add-p-coalesce-fix'
blob
|
commitdiff
|
raw
2009-05-29
Junio C Hamano
Merge branch 'rs/maint-grep-word-regexp-fix'
blob
|
commitdiff
|
raw
2009-05-26
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2009-05-26
Junio C Hamano
Merge branch 'js/maint-no-ln-across-libexec-and-bin...
blob
|
commitdiff
|
raw
2009-05-26
Junio C Hamano
Merge branch 'lt/maint-diff-reduce-lstat' into maint
blob
|
commitdiff
|
raw
2009-05-26
Junio C Hamano
Merge branch 'jm/format-patch-no-auto-n-when-k-is-given...
blob
|
commitdiff
|
raw
2009-05-26
Junio C Hamano
Merge branch 'do/maint-merge-recursive-fix' into maint
blob
|
commitdiff
|
raw
2009-05-26
Junio C Hamano
Merge branch 'jk/maint-1.6.0-trace-argv' into maint
blob
|
commitdiff
|
raw
2009-05-26
Junio C Hamano
Merge branch 'np/push-delta' into maint
blob
|
commitdiff
|
raw
2009-05-26
Junio C Hamano
Merge branch 'ar/merge-one-file-diag' into maint
blob
|
commitdiff
|
raw
2009-05-26
Junio C Hamano
Merge branch 'ar/unlink-err' into maint
blob
|
commitdiff
|
raw
2009-05-26
Junio C Hamano
Merge branch 'jk/maint-add-empty' into maint
blob
|
commitdiff
|
raw
2009-05-25
Michael J Gruber
merge-options.txt: Clarify merge --squash
blob
|
commitdiff
|
raw
2009-05-24
Junio C Hamano
Merge branch 'maint-1.6.0' into maint-1.6.1
blob
|
commitdiff
|
raw
|
diff to current
2009-05-23
Junio C Hamano
Merge branch 'jk/maint-1.6.0-trace-argv'
blob
|
commitdiff
|
raw
|
diff to current
2009-05-14
Junio C Hamano
Merge branch 'maint-1.6.0' into maint-1.6.1
blob
|
commitdiff
|
raw
|
diff to current
2009-05-09
Junio C Hamano
Merge branch 'maint-1.6.0' into maint-1.6.1
blob
|
commitdiff
|
raw
|
diff to current
2009-05-06
Junio C Hamano
Merge branch 'rj/maint-1.6.0-svn-parse-fix' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-05-06
Junio C Hamano
Merge branch 'maint-1.6.0' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-05-03
Junio C Hamano
Merge branch 'lt/pack-object-memuse' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-05-03
Junio C Hamano
Merge branch 'jc/maint-1.6.0-keep-pack' into maint...
blob
|
commitdiff
|
raw
|
diff to current
2009-05-03
Junio C Hamano
Merge branch 'jc/maint-1.6.0-diff-borrow-carefully...
blob
|
commitdiff
|
raw
|
diff to current
2009-05-03
Junio C Hamano
Merge branch 'bs/maint-1.6.0-tree-walk-prefix' into...
blob
|
commitdiff
|
raw
|
diff to current
2009-05-02
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2009-05-01
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2009-04-29
Junio C Hamano
Merge branch 'maint-1.6.0' into maint-1.6.1
blob
|
commitdiff
|
raw
|
diff to current
2009-04-28
Junio C Hamano
Merge branch 'maint-1.6.0' into maint-1.6.1
blob
|
commitdiff
|
raw
|
diff to current
2009-04-25
Junio C Hamano
Merge branch 'maint-1.6.0' into maint-1.6.1
blob
|
commitdiff
|
raw
|
diff to current
2009-04-18
Junio C Hamano
Merge branch 'lt/pack-object-memuse'
blob
|
commitdiff
|
raw
|
diff to current
2009-04-18
Junio C Hamano
Merge branch 'maint-1.6.0' into maint-1.6.1
blob
|
commitdiff
|
raw
|
diff to current
2009-04-18
Junio C Hamano
Merge branch 'bs/maint-1.6.0-tree-walk-prefix' into...
blob
|
commitdiff
|
raw
|
diff to current
2009-04-18
Junio C Hamano
Merge branch 'maint-1.6.0' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-04-18
Junio C Hamano
Merge branch 'maint-1.6.0' into maint-1.6.1
blob
|
commitdiff
|
raw
|
diff to current
2009-04-12
Junio C Hamano
Merge branch 'maint-1.6.0' into maint-1.6.1
blob
|
commitdiff
|
raw
|
diff to current
2009-04-09
Junio C Hamano
Merge branch 'jc/maint-1.6.0-diff-borrow-carefully...
blob
|
commitdiff
|
raw
|
diff to current
2009-04-09
Junio C Hamano
Merge branch 'maint-1.6.0' into maint-1.6.1
blob
|
commitdiff
|
raw
|
diff to current
2009-04-09
Junio C Hamano
Merge branch 'jc/maint-1.6.0-keep-pack' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-04-09
Junio C Hamano
Merge branch 'jc/maint-1.6.0-blame-s' into maint-1.6.1
blob
|
commitdiff
|
raw
|
diff to current
2009-04-09
Junio C Hamano
Merge branch 'js/maint-1.6.0-exec-path-env' into maint...
blob
|
commitdiff
|
raw
|
diff to current
2009-04-08
Junio C Hamano
Merge branch 'maint-1.6.0' into maint-1.6.1
blob
|
commitdiff
|
raw
|
diff to current
2009-04-08
Junio C Hamano
Merge branch 'bs/maint-1.6.0-tree-walk-prefix'
blob
|
commitdiff
|
raw
|
diff to current
2009-04-05
Junio C Hamano
Merge branch 'maint-1.6.0' into maint-1.6.1
blob
|
commitdiff
|
raw
|
diff to current
2009-04-02
Junio C Hamano
Merge branch 'jc/maint-1.6.0-blame-s' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-04-02
Junio C Hamano
Merge branch 'js/maint-1.6.0-exec-path-env' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-04-02
Junio C Hamano
Merge branch 'maint-1.6.0' into maint-1.6.1
blob
|
commitdiff
|
raw
|
diff to current
2009-04-02
Junio C Hamano
Merge branch 'jc/maint-1.6.0-keep-pack'
blob
|
commitdiff
|
raw
|
diff to current
2009-03-30
Junio C Hamano
Merge branch 'maint-1.6.0' into maint-1.6.1
blob
|
commitdiff
|
raw
|
diff to current
2009-03-30
Junio C Hamano
Merge branch 'maint-1.6.0' into maint-1.6.1
blob
|
commitdiff
|
raw
|
diff to current
2009-03-28
Junio C Hamano
Merge branch 'jc/maint-1.6.0-diff-borrow-carefully'
blob
|
commitdiff
|
raw
|
diff to current
2009-03-26
Junio C Hamano
Merge branch 'jc/maint-1.6.0-blame-s'
blob
|
commitdiff
|
raw
|
diff to current
next
![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
