tokkee.org
Code
projects
/
git.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
difftool/mergetool: add diffuse as merge and diff tool
[git.git]
/
builtin-fmt-merge-msg.c
2009-04-06
Junio C Hamano
Merge branch 'jc/shared-literally'
blob
|
commitdiff
|
raw
2009-04-05
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
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
Sync with 1.6.2.2
blob
|
commitdiff
|
raw
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 'tr/maint-1.6.1-doc-format-patch--root'
blob
|
commitdiff
|
raw
2009-04-02
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
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
2009-04-02
Junio C Hamano
Merge branch 'kb/tracking-count-no-merges'
blob
|
commitdiff
|
raw
2009-03-30
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
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'
blob
|
commitdiff
|
raw
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 'maint'
blob
|
commitdiff
|
raw
2009-03-28
Junio C Hamano
Merge branch 'jc/maint-1.6.0-diff-borrow-carefully'
blob
|
commitdiff
|
raw
2009-03-28
Junio C Hamano
Merge branch 'js/remote-improvements'
blob
|
commitdiff
|
raw
2009-03-28
Junio C Hamano
Merge branch 'jk/clone-post-checkout'
blob
|
commitdiff
|
raw
2009-03-27
Junio C Hamano
Merge branch 'db/push-cleanup'
blob
|
commitdiff
|
raw
2009-03-26
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2009-03-26
Junio C Hamano
Merge branch 'db/push-cleanup'
blob
|
commitdiff
|
raw
2009-03-26
Junio C Hamano
Merge branch 'jc/maint-1.6.0-blame-s'
blob
|
commitdiff
|
raw
2009-03-26
Junio C Hamano
Merge branch 'js/maint-diff-temp-smudge'
blob
|
commitdiff
|
raw
2009-03-26
Junio C Hamano
Merge branch 'js/maint-1.6.0-exec-path-env'
blob
|
commitdiff
|
raw
2009-03-26
Junio C Hamano
Merge branch 'bc/maint-1.6.1-branch-deleted-was'
blob
|
commitdiff
|
raw
2009-03-26
Junio C Hamano
Merge branch 'dm/maint-docco'
blob
|
commitdiff
|
raw
2009-03-25
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2009-03-24
Junio C Hamano
Merge branch 'maint-1.6.0' into maint-1.6.1
blob
|
commitdiff
|
raw
|
diff to current
2009-03-22
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2009-03-22
Junio C Hamano
Merge branch 'maint-1.6.0' into maint-1.6.1
blob
|
commitdiff
|
raw
|
diff to current
2009-03-22
Junio C Hamano
Merge branch 'dm/maint-docco'
blob
|
commitdiff
|
raw
2009-03-22
Junio C Hamano
Sync with maint
blob
|
commitdiff
|
raw
2009-03-22
Junio C Hamano
Merge branch 'tr/maint-1.6.0-send-email-irt' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-03-22
Junio C Hamano
Merge branch 'jc/maint-1.6.0-read-tree-overlay' into...
blob
|
commitdiff
|
raw
|
diff to current
2009-03-22
Junio C Hamano
Merge branch 'js/maint-1.6.0-path-normalize' into maint...
blob
|
commitdiff
|
raw
|
diff to current
2009-03-22
Junio C Hamano
Merge branch 'jc/maint-1.6.0-pack-directory' into maint...
blob
|
commitdiff
|
raw
|
diff to current
2009-03-20
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2009-03-20
Junio C Hamano
Merge branch 'mv/parseopt-ls-files'
blob
|
commitdiff
|
raw
2009-03-20
Junio C Hamano
Merge branch 'xx/db-refspec-vs-js-remote'
blob
|
commitdiff
|
raw
2009-03-20
Junio C Hamano
Merge branch 'jc/clone-branch-rebase'
blob
|
commitdiff
|
raw
2009-03-20
Junio C Hamano
Merge branch 'js/rebase-i-opt'
blob
|
commitdiff
|
raw
2009-03-20
Junio C Hamano
Merge branch 'fc/parseopt-config'
blob
|
commitdiff
|
raw
2009-03-18
Junio C Hamano
Merge branch 'jc/maint-1.6.0-read-tree-overlay'
blob
|
commitdiff
|
raw
2009-03-18
Junio C Hamano
Merge branch 'db/maint-missing-origin'
blob
|
commitdiff
|
raw
2009-03-18
Junio C Hamano
Merge branch 'js/rsync-local'
blob
|
commitdiff
|
raw
2009-03-18
Junio C Hamano
Merge branch 'rs/color-grep'
blob
|
commitdiff
|
raw
2009-03-18
Junio C Hamano
Merge branch 'js/remote-improvements'
blob
|
commitdiff
|
raw
2009-03-18
Junio C Hamano
Merge branch 'tr/maint-1.6.0-send-email-irt'
blob
|
commitdiff
|
raw
2009-03-18
Junio C Hamano
Merge branch 'kb/checkout-optim'
blob
|
commitdiff
|
raw
2009-03-15
Junio C Hamano
Sync with GIT 1.6.2.1
blob
|
commitdiff
|
raw
2009-03-13
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2009-03-13
Junio C Hamano
Merge branch 'maint-1.6.0' into maint-1.6.1
blob
|
commitdiff
|
raw
|
diff to current
2009-03-13
Junio C Hamano
Merge branch 'js/maint-1.6.1-remote-remove-mirror'...
blob
|
commitdiff
|
raw
|
diff to current
2009-03-13
Junio C Hamano
Merge branch 'ks/maint-1.6.0-mailinfo-folded' into...
blob
|
commitdiff
|
raw
|
diff to current
2009-03-11
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2009-03-11
Junio C Hamano
Merge branch 'fg/maint-exclude-bq' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-03-11
Junio C Hamano
Merge branch 'mg/maint-submodule-normalize-path'
blob
|
commitdiff
|
raw
2009-03-11
Junio C Hamano
Merge branch 'jc/maint-1.6.0-keep-pack'
blob
|
commitdiff
|
raw
2009-03-11
Junio C Hamano
Merge branch 'rs/memmem'
blob
|
commitdiff
|
raw
2009-03-11
Junio C Hamano
Merge branch 'tv/rebase-stat'
blob
|
commitdiff
|
raw
2009-03-11
Junio C Hamano
Merge branch 'jk/clone-post-checkout'
blob
|
commitdiff
|
raw
2009-03-11
Junio C Hamano
Merge branch 'tr/format-patch-thread'
blob
|
commitdiff
|
raw
2009-03-11
Junio C Hamano
Merge branch 'el/blame-date'
blob
|
commitdiff
|
raw
2009-03-11
Junio C Hamano
Merge branch 'tr/gcov'
blob
|
commitdiff
|
raw
2009-03-08
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2009-03-08
Benjamin Kramer
Move local variables to narrower scopes
blob
|
commitdiff
|
raw
2009-03-05
Junio C Hamano
Merge branch 'fg/exclude-bq'
blob
|
commitdiff
|
raw
|
diff to current
2009-03-02
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2009-03-01
Junio C Hamano
Merge branch 'jc/maint-1.6.0-pack-directory'
blob
|
commitdiff
|
raw
|
diff to current
2009-02-28
Junio C Hamano
Merge branch 'maint-1.6.0' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-02-28
Junio C Hamano
Merge branch 'cc/maint-1.6.0-bisect-fix'
blob
|
commitdiff
|
raw
|
diff to current
2009-02-27
Junio C Hamano
Merge branch 'cc/maint-1.6.0-bisect-fix'
blob
|
commitdiff
|
raw
|
diff to current
2009-02-25
Junio C Hamano
Merge branch 'jc/maint-1.6.0-pack-directory'
blob
|
commitdiff
|
raw
|
diff to current
2009-02-12
Junio C Hamano
Merge branch 'maint-1.6.0' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-02-11
Junio C Hamano
Merge branch 'maint-1.5.6' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-02-11
Junio C Hamano
Merge branch 'maint-1.5.5' into maint-1.5.6
blob
|
commitdiff
|
raw
|
diff to current
2009-02-11
Junio C Hamano
Merge branch 'maint-1.5.4' into maint-1.5.5
blob
|
commitdiff
|
raw
|
diff to current
2009-02-11
Junio C Hamano
Merge branch 'js/maint-1.6.0-path-normalize'
blob
|
commitdiff
|
raw
|
diff to current
2009-02-10
Junio C Hamano
Merge branch 'maint-1.6.0' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-02-06
Junio C Hamano
Merge branch 'js/maint-remote-remove-mirror'
blob
|
commitdiff
|
raw
|
diff to current
2009-02-06
Junio C Hamano
Merge branch 'maint-1.6.0' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-02-06
Junio C Hamano
Merge branch 'sg/maint-gitdir-in-subdir' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-02-06
Junio C Hamano
Merge branch 'lt/maint-wrap-zlib' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-02-06
Junio C Hamano
Merge branch 'js/maint-all-implies-HEAD' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-02-06
Junio C Hamano
Merge branch 'kc/maint-diff-bwi-fix' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-02-04
Junio C Hamano
Merge branch 'maint-1.6.0' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-02-04
Junio C Hamano
Merge branch 'maint-1.6.0' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-02-03
Junio C Hamano
Merge branch 'maint-1.6.0' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-02-01
Junio C Hamano
Merge branch 'ks/maint-mailinfo-folded'
blob
|
commitdiff
|
raw
|
diff to current
2009-02-01
Junio C Hamano
Merge branch 'maint-1.6.0' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-01-29
Junio C Hamano
Merge branch 'jc/maint-format-patch-o-relative' into...
blob
|
commitdiff
|
raw
|
diff to current
2009-01-29
Junio C Hamano
Merge branch 'bs/maint-rename-populate-filespec' into...
blob
|
commitdiff
|
raw
|
diff to current
2009-01-29
Junio C Hamano
Merge branch 'maint-1.6.0' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-01-27
Junio C Hamano
Merge branch 'maint-1.6.0' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-01-27
Junio C Hamano
Merge branch 'jc/maint-1.6.0-split-diff-metainfo' into...
blob
|
commitdiff
|
raw
|
diff to current
2009-01-26
Junio C Hamano
Merge branch 'js/maint-all-implies-HEAD'
blob
|
commitdiff
|
raw
|
diff to current
2009-01-24
Junio C Hamano
Merge branch 'cb/maint-unpack-trees-absense' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-01-24
Junio C Hamano
Merge branch 'jc/maint-format-patch' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-01-24
Junio C Hamano
Merge branch 'maint-1.6.0' into maint
blob
|
commitdiff
|
raw
|
diff to current
next
![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
