projects
/
git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Merge branch 'maint'
[git]
/
builtin-merge.c
2009-07-08
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2009-07-08
Junio C Hamano
Merge branch 'cb/maint-fetch-refspec-wo-dst' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-07-06
Junio C Hamano
Merge branch 'tr/die_errno'
blob
|
commitdiff
|
raw
2009-07-06
Junio C Hamano
Merge branch 'cb/maint-fetch-refspec-wo-dst'
blob
|
commitdiff
|
raw
|
diff to current
2009-07-06
Junio C Hamano
Merge branch 'gb/am-foreign'
blob
|
commitdiff
|
raw
|
diff to current
2009-07-06
Junio C Hamano
Merge branch 'jk/use-our-regexp'
blob
|
commitdiff
|
raw
|
diff to current
2009-07-06
Junio C Hamano
Merge branch 'uk/rev-parse-parse-opt'
blob
|
commitdiff
|
raw
|
diff to current
2009-07-02
Junio C Hamano
Merge branch 'cc/bisect'
blob
|
commitdiff
|
raw
|
diff to current
2009-07-02
Junio C Hamano
Merge branch 'js/daemon-log'
blob
|
commitdiff
|
raw
|
diff to current
2009-07-02
Junio C Hamano
Merge branch 'cf/maint-remote-uploadpack-useconfig...
blob
|
commitdiff
|
raw
|
diff to current
2009-07-02
Junio C Hamano
Merge branch 'sb/quiet-porcelains'
blob
|
commitdiff
|
raw
|
diff to current
2009-07-02
Junio C Hamano
Merge branch 'ne/maint-1.6.0-diff-tree-t-r-show-directory'
blob
|
commitdiff
|
raw
|
diff to current
2009-07-02
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-06-30
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-06-27
Junio C Hamano
Merge branch 'pb/send-email-cccmd-fix'
blob
|
commitdiff
|
raw
|
diff to current
2009-06-27
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-06-27
Thomas Rast
Use die_errno() instead of die() when checking syscalls
blob
|
commitdiff
|
raw
|
diff to current
2009-06-27
Thomas Rast
Convert existing die(..., strerror(errno)) to die_errno()
blob
|
commitdiff
|
raw
|
diff to current
2009-06-22
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-06-22
Junio C Hamano
Merge branch 'sb/maint-1.6.0-add-config-fix' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-06-22
Junio C Hamano
Sync with 1.6.3.3
blob
|
commitdiff
|
raw
|
diff to current
2009-06-22
Junio C Hamano
Merge branch 'ak/maint-for-each-ref-no-lookup' into...
blob
|
commitdiff
|
raw
|
diff to current
2009-06-22
Junio C Hamano
Merge branch 'rc/maint-http-local-slot-fix' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-06-22
Junio C Hamano
Merge branch 'cb/maint-no-double-merge' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-06-22
Junio C Hamano
Merge branch 'pb/maint-1.6.2-userdiff-fix' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-06-21
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-06-21
Junio C Hamano
Merge branch 'maint-1.6.2' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-06-21
Junio C Hamano
Merge branch 'maint-1.6.1' into maint-1.6.2
blob
|
commitdiff
|
raw
|
diff to current
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
Linus Torvalds
Fix various sparse warnings in the git source code
blob
|
commitdiff
|
raw
|
diff to current
2009-06-21
Junio C Hamano
Merge branch 'ph/submodule-rebase'
blob
|
commitdiff
|
raw
|
diff to current
2009-06-21
Junio C Hamano
Merge branch 'jc/cache-tree'
blob
|
commitdiff
|
raw
|
diff to current
2009-06-21
Junio C Hamano
Merge branch 'mg/pushurl'
blob
|
commitdiff
|
raw
|
diff to current
2009-06-21
Junio C Hamano
Merge branch 'mn/maint-iconv-autoconf'
blob
|
commitdiff
|
raw
|
diff to current
2009-06-21
Junio C Hamano
Merge branch 'sb/pull-rebase'
blob
|
commitdiff
|
raw
|
diff to current
2009-06-21
Junio C Hamano
Merge branch 'pb/maint-1.6.2-userdiff-fix'
blob
|
commitdiff
|
raw
|
diff to current
2009-06-21
Junio C Hamano
Merge branch 'sb/maint-1.6.0-add-config-fix'
blob
|
commitdiff
|
raw
|
diff to current
2009-06-21
Junio C Hamano
Merge branch 'lt/maint-unsigned-left-shift'
blob
|
commitdiff
|
raw
|
diff to current
2009-06-20
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2009-06-18
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-06-18
Junio C Hamano
Merge branch 'sb/parse-options-integer'
blob
|
commitdiff
|
raw
|
diff to current
2009-06-18
Junio C Hamano
Merge branch 'ak/maint-for-each-ref-no-lookup'
blob
|
commitdiff
|
raw
|
diff to current
2009-06-14
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-06-14
Junio C Hamano
Merge branch 'maint-1.6.2' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-06-14
Junio C Hamano
Merge branch 'maint-1.6.1' into maint-1.6.2
blob
|
commitdiff
|
raw
|
diff to current
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 'mh/fix-send-email-threaded'
blob
|
commitdiff
|
raw
|
diff to current
2009-06-13
Junio C Hamano
Merge branch 'rc/http-push'
blob
|
commitdiff
|
raw
|
diff to current
2009-06-13
Junio C Hamano
Merge branch 'cc/bisect' (early part)
blob
|
commitdiff
|
raw
|
diff to current
2009-06-13
Junio C Hamano
Merge branch 'rc/maint-http-local-slot-fix'
blob
|
commitdiff
|
raw
|
diff to current
2009-06-13
Junio C Hamano
Merge branch 'sp/msysgit'
blob
|
commitdiff
|
raw
|
diff to current
2009-06-13
Junio C Hamano
Merge branch 'cb/maint-no-double-merge'
blob
|
commitdiff
|
raw
|
diff to current
2009-06-13
Junio C Hamano
Merge branch 'ph/submodule-rebase' (early part)
blob
|
commitdiff
|
raw
|
diff to current
2009-06-13
Junio C Hamano
Merge branch 'bc/solaris'
blob
|
commitdiff
|
raw
|
diff to current
2009-06-13
Junio C Hamano
Merge branch 'cb/match_refs_internal_tail'
blob
|
commitdiff
|
raw
|
diff to current
2009-06-13
Junio C Hamano
Merge branch 'nw/maint-cvsexportcommit'
blob
|
commitdiff
|
raw
|
diff to current
2009-06-13
Junio C Hamano
Merge branch 'da/araxis-mergetool'
blob
|
commitdiff
|
raw
|
diff to current
2009-06-12
Junio C Hamano
Merge branch 'mh/maint-fix-send-email-threaded' into...
blob
|
commitdiff
|
raw
|
diff to current
2009-06-12
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-06-11
Junio C Hamano
Merge branch 'uk/maint-1.5.3-rebase-i-reflog' into...
blob
|
commitdiff
|
raw
|
diff to current
2009-06-09
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-06-07
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-06-04
Junio C Hamano
Merge branch 'maint' to sync with 1.6.3.2
blob
|
commitdiff
|
raw
|
diff to current
2009-06-03
Junio C Hamano
Merge branch 'da/pretty-tempname'
blob
|
commitdiff
|
raw
|
diff to current
2009-06-03
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-06-02
Junio C Hamano
Merge branch 'cb/maint-1.6.0-xdl-merge-fix' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-06-02
Junio C Hamano
Merge branch 'sb/maint-1.6.2-opt-filename-fix' into...
blob
|
commitdiff
|
raw
|
diff to current
2009-06-02
Clemens Buchacher
refuse to merge during a merge
blob
|
commitdiff
|
raw
|
diff to current
2009-05-31
Junio C Hamano
Merge branch 'sb/opt-filename'
blob
|
commitdiff
|
raw
|
diff to current
2009-05-31
Junio C Hamano
Merge branch 'mw/send-email'
blob
|
commitdiff
|
raw
|
diff to current
2009-05-29
Junio C Hamano
Merge branch 'sb/maint-1.6.2-opt-filename-fix'
blob
|
commitdiff
|
raw
|
diff to current
2009-05-26
Junio C Hamano
Merge branch 'js/maint-no-ln-across-libexec-and-bin...
blob
|
commitdiff
|
raw
|
diff to current
2009-05-26
Junio C Hamano
Merge branch 'lt/maint-diff-reduce-lstat' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-05-26
Junio C Hamano
Merge branch 'do/maint-merge-recursive-fix' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-05-26
Junio C Hamano
Merge branch 'jk/maint-1.6.0-trace-argv' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-05-25
Stephen Boyd
parse-opts: prepare for OPT_FILENAME
blob
|
commitdiff
|
raw
|
diff to current
2009-05-25
Junio C Hamano
Merge branch 'master' into sb/opt-filename
blob
|
commitdiff
|
raw
|
diff to current
2009-05-24
Junio C Hamano
Merge branch 'maint-1.6.2' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-05-24
Junio C Hamano
Merge branch 'maint-1.6.1' into maint-1.6.2
blob
|
commitdiff
|
raw
|
diff to current
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 'mg/track'
blob
|
commitdiff
|
raw
|
diff to current
2009-05-23
Junio C Hamano
Merge branch 'js/maint-no-ln-across-libexec-and-bin'
blob
|
commitdiff
|
raw
|
diff to current
2009-05-23
Junio C Hamano
Merge branch 'lt/maint-diff-reduce-lstat'
blob
|
commitdiff
|
raw
|
diff to current
2009-05-23
Junio C Hamano
Merge branch 'do/maint-merge-recursive-fix'
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-23
Junio C Hamano
Merge branch 'mh/show-branch-color' into sb/show-branch...
blob
|
commitdiff
|
raw
|
diff to current
2009-05-18
Junio C Hamano
Merge branch 'js/add-edit'
blob
|
commitdiff
|
raw
|
diff to current
2009-05-18
Junio C Hamano
Merge branch 'mh/diff-stat-color'
blob
|
commitdiff
|
raw
|
diff to current
2009-05-18
Junio C Hamano
Merge branch 'mh/show-branch-color'
blob
|
commitdiff
|
raw
|
diff to current
2009-05-18
Junio C Hamano
Merge branch 'ac/graph-horizontal-line'
blob
|
commitdiff
|
raw
|
diff to current
2009-05-18
Junio C Hamano
Merge branch 'ae/anon-fetch-info'
blob
|
commitdiff
|
raw
|
diff to current
2009-05-16
Junio C Hamano
Merge branch 'maint-1.6.2' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-05-14
Junio C Hamano
Merge branch 'maint-1.6.1' into maint-1.6.2
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-12
Junio C Hamano
Merge branch 'maint-1.6.2' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-05-12
Junio C Hamano
Merge branch 'jc/maint-read-tree-multi' into maint...
blob
|
commitdiff
|
raw
|
diff to current
2009-05-09
Junio C Hamano
Merge branch 'maint-1.6.1' into maint-1.6.2
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 'maint'
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
next
projects / git / history
Junio C Hamano
Thomas Rast
Linus Torvalds
Clemens Buchacher
Stephen Boyd