tokkee.org
Code
projects
/
git.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Do not use date.c:tm_to_time_t() from compat/mingw.c
[git.git]
/
merge-recursive.c
2010-01-13
Junio C Hamano
Merge branch 'jc/checkout-merge-base'
blob
|
commitdiff
|
raw
2010-01-13
Junio C Hamano
Merge branch 'nd/sparse'
blob
|
commitdiff
|
raw
2010-01-10
Junio C Hamano
Merge branch 'tr/http-updates'
blob
|
commitdiff
|
raw
2010-01-10
Junio C Hamano
Merge branch 'jk/maint-1.6.5-reset-hard'
blob
|
commitdiff
|
raw
2010-01-10
Junio C Hamano
Merge branch 'tr/maint-1.6.5-bash-prompt-show-submodule...
blob
|
commitdiff
|
raw
2010-01-10
Junio C Hamano
Merge branch 'bg/maint-remote-update-default'
blob
|
commitdiff
|
raw
2010-01-10
Junio C Hamano
Merge branch 'maint-1.6.2' into maint
blob
|
commitdiff
|
raw
2010-01-10
Junio C Hamano
Merge branch 'maint-1.6.1' into maint-1.6.2
blob
|
commitdiff
|
raw
|
diff to current
2010-01-10
Junio C Hamano
Merge branch 'maint-1.6.0' into maint-1.6.1
blob
|
commitdiff
|
raw
|
diff to current
2010-01-07
Junio C Hamano
Merge branch 'js/filter-branch-prime'
blob
|
commitdiff
|
raw
2010-01-07
Junio C Hamano
Merge branch 'sb/maint-octopus'
blob
|
commitdiff
|
raw
2010-01-07
Junio C Hamano
Merge branch 'bg/maint-add-all-doc'
blob
|
commitdiff
|
raw
2010-01-07
Junio C Hamano
Merge branch 'mo/bin-wrappers'
blob
|
commitdiff
|
raw
2009-12-31
Junio C Hamano
Merge branch 'maint-1.6.0' into maint
blob
|
commitdiff
|
raw
2009-12-30
Junio C Hamano
Merge branch 'maint-1.6.1' into maint
blob
|
commitdiff
|
raw
2009-12-30
Junio C Hamano
Merge branch 'maint-1.6.0' into maint-1.6.1
blob
|
commitdiff
|
raw
|
diff to current
2009-12-28
Junio C Hamano
Merge branch 'jk/1.7.0-status'
blob
|
commitdiff
|
raw
2009-12-27
Junio C Hamano
Merge branch 'nf/maint-fix-index-ext-len-on-be64' into...
blob
|
commitdiff
|
raw
2009-12-26
Junio C Hamano
Merge branch 'gb/1.7.0-diff-whitespace-only-output'
blob
|
commitdiff
|
raw
2009-12-26
Junio C Hamano
Merge branch 'jc/1.7.0-diff-whitespace-only-status'
blob
|
commitdiff
|
raw
2009-12-26
Junio C Hamano
Merge branch 'jc/1.7.0-push-safety'
blob
|
commitdiff
|
raw
2009-12-26
Junio C Hamano
Merge branch 'jc/1.7.0-send-email-no-thread-default'
blob
|
commitdiff
|
raw
2009-12-26
Junio C Hamano
Merge branch 'sr/vcs-helper'
blob
|
commitdiff
|
raw
2009-12-22
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2009-12-20
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2009-12-16
Junio C Hamano
Merge branch 'maint' to sync with 1.6.5.7
blob
|
commitdiff
|
raw
2009-12-11
Junio C Hamano
Sync with 1.6.5.6
blob
|
commitdiff
|
raw
2009-12-09
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
2009-12-09
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
2009-12-09
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2009-12-09
Junio C Hamano
Merge branch 'mm/maint-merge-ff-error-message-fix'...
blob
|
commitdiff
|
raw
|
diff to current
2009-12-09
Junio C Hamano
Merge branch 'jn/maint-pull-rebase-error-message' into...
blob
|
commitdiff
|
raw
|
diff to current
2009-12-09
Junio C Hamano
Merge branch 'jk/maint-add-p-delete-fix' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-12-07
Junio C Hamano
Merge branch 'master' into il/vcs-helper
blob
|
commitdiff
|
raw
2009-12-05
Junio C Hamano
Sync with 1.6.5.5
blob
|
commitdiff
|
raw
2009-12-03
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2009-12-03
Junio C Hamano
Merge branch 'uk/maint-shortlog-encoding' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-12-03
Junio C Hamano
Merge branch 'fc/maint-format-patch-pathspec-dashes...
blob
|
commitdiff
|
raw
|
diff to current
2009-12-03
Junio C Hamano
Merge branch 'ap/maint-merge-strategy-list-fix' into...
blob
|
commitdiff
|
raw
|
diff to current
2009-12-03
Junio C Hamano
Merge branch 'jc/maint-am-keep' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-12-03
Junio C Hamano
Merge branch 'rs/work-around-grep-opt-insanity' into...
blob
|
commitdiff
|
raw
|
diff to current
2009-12-03
Junio C Hamano
Merge branch 'rj/maint-cygwin-count-objects' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-12-03
Junio C Hamano
Merge branch 'mm/maint-hint-failed-merge' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-12-03
Junio C Hamano
Merge branch 'np/maint-sideband-favor-status' into...
blob
|
commitdiff
|
raw
|
diff to current
2009-12-03
Junio C Hamano
Merge in 1.6.5.4
blob
|
commitdiff
|
raw
2009-12-03
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2009-12-02
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2009-12-01
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2009-12-01
Junio C Hamano
Merge branch 'jc/deprecate-old-syntax-from-merge'
blob
|
commitdiff
|
raw
2009-12-01
Junio C Hamano
Merge branch 'bw/remote-get-ref-states-fix'
blob
|
commitdiff
|
raw
2009-12-01
Junio C Hamano
Merge branch 'jn/gitweb-blame'
blob
|
commitdiff
|
raw
2009-11-30
Junio C Hamano
Merge branch 'fc/maint-format-patch-pathspec-dashes'
blob
|
commitdiff
|
raw
2009-11-30
Junio C Hamano
Merge branch 'mm/maint-merge-ff-error-message-fix'
blob
|
commitdiff
|
raw
2009-11-30
Junio C Hamano
Merge branch 'ap/maint-merge-strategy-list-fix'
blob
|
commitdiff
|
raw
|
diff to current
2009-11-30
Junio C Hamano
Merge branch 'jc/pretty-lf'
blob
|
commitdiff
|
raw
|
diff to current
2009-11-30
Junio C Hamano
Merge branch 'cc/bisect-doc'
blob
|
commitdiff
|
raw
|
diff to current
2009-11-30
Junio C Hamano
Merge branch 'em/commit-claim'
blob
|
commitdiff
|
raw
|
diff to current
2009-11-30
Junio C Hamano
Merge branch 'jc/mailinfo-remove-brackets'
blob
|
commitdiff
|
raw
|
diff to current
2009-11-30
Junio C Hamano
Merge branch 'fc/send-email-envelope'
blob
|
commitdiff
|
raw
|
diff to current
2009-11-30
Junio C Hamano
Merge branch 'uk/maint-shortlog-encoding'
blob
|
commitdiff
|
raw
|
diff to current
2009-11-30
Junio C Hamano
Merge branch 'jc/maint-am-keep'
blob
|
commitdiff
|
raw
|
diff to current
2009-11-30
Matthieu Moy
merge-recursive: make the error-message generation...
blob
|
commitdiff
|
raw
|
diff to current
2009-11-27
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-11-25
Junio C Hamano
Merge branch 'rs/work-around-grep-opt-insanity'
blob
|
commitdiff
|
raw
|
diff to current
2009-11-24
Junio C Hamano
Merge branch 'rj/maint-cygwin-count-objects'
blob
|
commitdiff
|
raw
|
diff to current
2009-11-24
Junio C Hamano
Merge branch 'rs/color-escape-has-zero-width'
blob
|
commitdiff
|
raw
|
diff to current
2009-11-24
Junio C Hamano
Merge branch 'bg/apply-doc'
blob
|
commitdiff
|
raw
|
diff to current
2009-11-24
Junio C Hamano
Merge branch 'mm/maint-hint-failed-merge'
blob
|
commitdiff
|
raw
|
diff to current
2009-11-24
Junio C Hamano
Merge branch 'jc/log-stdin'
blob
|
commitdiff
|
raw
|
diff to current
2009-11-24
Junio C Hamano
Merge branch 'mr/gitweb-snapshot'
blob
|
commitdiff
|
raw
|
diff to current
2009-11-24
Junio C Hamano
Merge branch 'cc/replace'
blob
|
commitdiff
|
raw
|
diff to current
2009-11-24
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-11-23
Junio C Hamano
Merge branch 'bg/fetch-multi'
blob
|
commitdiff
|
raw
|
diff to current
2009-11-23
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-11-23
Junio C Hamano
Merge git://git.bogomips.org/git-svn
blob
|
commitdiff
|
raw
|
diff to current
2009-11-23
Junio C Hamano
Merge branch 'th/maint-remote-update-help-string'
blob
|
commitdiff
|
raw
|
diff to current
2009-11-23
Junio C Hamano
Merge branch 'jn/faster-completion-startup'
blob
|
commitdiff
|
raw
|
diff to current
2009-11-23
Junio C Hamano
Merge branch 'rj/maint-t9700'
blob
|
commitdiff
|
raw
|
diff to current
2009-11-23
Junio C Hamano
Merge branch 'ls/maint-mailinfo-no-inbody'
blob
|
commitdiff
|
raw
|
diff to current
2009-11-23
Junio C Hamano
Merge branch 'mo/maint-crlf-doc'
blob
|
commitdiff
|
raw
|
diff to current
2009-11-23
Junio C Hamano
Merge branch 'th/remote-usage'
blob
|
commitdiff
|
raw
|
diff to current
2009-11-23
Junio C Hamano
Merge branch 'pb/maint-use-custom-perl'
blob
|
commitdiff
|
raw
|
diff to current
2009-11-23
Junio C Hamano
Merge branch 'mm/config-pathname-tilde-expand'
blob
|
commitdiff
|
raw
|
diff to current
2009-11-23
Junio C Hamano
Merge branch 'bc/grep-i-F'
blob
|
commitdiff
|
raw
|
diff to current
2009-11-23
Junio C Hamano
Merge branch 'jk/maint-break-rename-reduce-memory'
blob
|
commitdiff
|
raw
|
diff to current
2009-11-23
Junio C Hamano
Merge branch 'tc/format-attribute'
blob
|
commitdiff
|
raw
|
diff to current
2009-11-23
Matthieu Moy
merge-recursive: point the user to commit when file...
blob
|
commitdiff
|
raw
|
diff to current
2009-11-21
Junio C Hamano
Merge branch 'jc/fix-tree-walk' (early part)
blob
|
commitdiff
|
raw
|
diff to current
2009-11-18
Junio C Hamano
Merge branch 'np/maint-sideband-favor-status'
blob
|
commitdiff
|
raw
|
diff to current
2009-11-16
Junio C Hamano
Merge branch 'jk/maint-1.6.3-ls-files-i' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-11-16
Junio C Hamano
Merge branch 'jc/maint-blank-at-eof' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-11-16
Tarmigan Casebolt
Check the format of more printf-type functions
blob
|
commitdiff
|
raw
|
diff to current
2009-11-16
Junio C Hamano
Merge branch 'jc/maint-1.6.3-graft-trailing-space'...
blob
|
commitdiff
|
raw
|
diff to current
2009-11-16
Junio C Hamano
Merge branch 'tr/maint-roff-quote' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-11-10
Junio C Hamano
Merge branch 'jk/maint-1.6.3-ls-files-i'
blob
|
commitdiff
|
raw
|
diff to current
2009-10-31
Junio C Hamano
Merge branch 'jc/maint-1.6.3-graft-trailing-space'
blob
|
commitdiff
|
raw
|
diff to current
2009-10-31
Junio C Hamano
Merge branch 'tr/maint-roff-quote'
blob
|
commitdiff
|
raw
|
diff to current
2009-10-28
Junio C Hamano
Merge branch 'maint-1.6.4' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-10-27
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2009-10-25
Junio C Hamano
Merge branch 'maint-1.6.4' into maint
blob
|
commitdiff
|
raw
|
diff to current
next
![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
