tokkee.org
Code
projects
/
git.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Recent MinGW has a C99 implementation of snprintf functions
[git.git]
/
merge-file.c
2010-05-04
Junio C Hamano
Merge branch 'maint-1.7.0' into maint
blob
|
commitdiff
|
raw
2010-05-02
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2010-04-24
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2010-04-23
Junio C Hamano
Sync with 1.7.0.6
blob
|
commitdiff
|
raw
2010-04-23
Junio C Hamano
Merge branch 'jk/maint-diffstat-overflow' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-04-22
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2010-04-20
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2010-04-19
Junio C Hamano
Merge branch 'maint-1.6.6' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-04-19
Junio C Hamano
Merge branch 'wp/doc-filter-direction'
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 'maint'
blob
|
commitdiff
|
raw
2010-04-19
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
2010-04-17
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2010-04-14
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2010-04-11
Junio C Hamano
Merge branch 'jl/maint-submodule-gitfile-awareness'
blob
|
commitdiff
|
raw
2010-04-11
Junio C Hamano
Sync with 1.7.0.5
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 'mr/gitweb-jsmin'
blob
|
commitdiff
|
raw
2010-04-10
Junio C Hamano
Merge branch 'jl/maint-submodule-gitfile-awareness'
blob
|
commitdiff
|
raw
2010-04-10
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
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
2010-04-09
Junio C Hamano
Merge early parts of jk/cached-textconv
blob
|
commitdiff
|
raw
2010-04-09
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2010-04-07
Junio C Hamano
Merge branch 'mg/notes-reflog'
blob
|
commitdiff
|
raw
2010-04-07
Junio C Hamano
Merge branch 'jn/mailinfo-scissors'
blob
|
commitdiff
|
raw
2010-04-06
Junio C Hamano
Merge branch 'da/maint-python-startup'
blob
|
commitdiff
|
raw
2010-04-06
Junio C Hamano
Merge branch 'ic/bash-completion-rpm'
blob
|
commitdiff
|
raw
2010-04-06
Junio C Hamano
Merge branch 'sb/fmt-merge-msg'
blob
|
commitdiff
|
raw
2010-04-06
Junio C Hamano
Merge branch 'jc/conflict-marker-size'
blob
|
commitdiff
|
raw
2010-04-06
Junio C Hamano
Merge branch 'ef/maint-empty-commit-log'
blob
|
commitdiff
|
raw
2010-04-06
Junio C Hamano
Merge branch 'sg/bash-completion'
blob
|
commitdiff
|
raw
2010-04-04
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2010-04-03
Junio C Hamano
Merge branch 'mb/rebase-i-no-ff'
blob
|
commitdiff
|
raw
2010-04-03
Junio C Hamano
Merge branch 'sp/maint-http-backend-die-triggers-die...
blob
|
commitdiff
|
raw
2010-04-03
Junio C Hamano
Merge branch 'rr/imap-send-unconfuse-from-line'
blob
|
commitdiff
|
raw
2010-04-03
Junio C Hamano
Merge branch 'mg/use-default-abbrev-length-in-rev-list'
blob
|
commitdiff
|
raw
2010-04-03
Junio C Hamano
Merge branch 'mg/maint-send-email-lazy-editor'
blob
|
commitdiff
|
raw
2010-04-03
Junio C Hamano
Merge branch 'rb/maint-python-path'
blob
|
commitdiff
|
raw
2010-04-03
Junio C Hamano
Merge branch 'jn/merge-diff3-label'
blob
|
commitdiff
|
raw
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 'cp/add-u-pathspec' into maint
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-21
Jonathan Nieder
merge_file(): add comment explaining behavior wrt confl...
blob
|
commitdiff
|
raw
2010-03-21
Jonathan Nieder
ll_merge(): add ancestor label parameter for diff3...
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-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 'gf/maint-sh-setup-nongit-ok' into maint...
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 '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-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
next
![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
