projects
/
git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Merge branch 'uk/rev-parse-parse-opt'
[git]
/
merge-recursive.c
2009-07-06
Junio C Hamano
Merge branch 'uk/rev-parse-parse-opt'
blob
|
commitdiff
|
raw
2009-07-02
Martin Renold
Remove filename from conflict markers
blob
|
commitdiff
|
raw
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-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 'rc/maint-http-local-slot-fix' 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 '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-20
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
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 '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 'ph/submodule-rebase' (early part)
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-11
Junio C Hamano
Merge branch 'uk/maint-1.5.3-rebase-i-reflog' into...
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 'rs/maint-grep-word-regexp-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
Junio C Hamano
Merge branch 'jc/maint-add-p-coalesce-fix' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-05-31
Junio C Hamano
Merge branch 'jc/solaris-0811'
blob
|
commitdiff
|
raw
|
diff to current
2009-05-31
Junio C Hamano
Merge branch 'sb/show-branch-parse-options'
blob
|
commitdiff
|
raw
|
diff to current
2009-05-31
Junio C Hamano
Merge branch 'sb/format-patch-parseopt'
blob
|
commitdiff
|
raw
|
diff to current
2009-05-31
Junio C Hamano
Merge branch 'jc/mktree'
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-31
Junio C Hamano
Merge branch 'cc/bisect' (early part)
blob
|
commitdiff
|
raw
|
diff to current
2009-05-31
Eric Wong
t9139 uses ancient, backwards-compatible iconv names
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-29
Junio C Hamano
Merge branch 'jc/maint-add-p-coalesce-fix'
blob
|
commitdiff
|
raw
|
diff to current
2009-05-29
Junio C Hamano
Merge branch 'rs/maint-grep-word-regexp-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 'jm/format-patch-no-auto-n-when-k-is-given...
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
Junio C Hamano
Merge branch 'jc/mktree' into sb/opt-filename
blob
|
commitdiff
|
raw
|
diff to current
2009-05-25
Junio C Hamano
Merge branch 'sb/format-patch-parseopt' into sb/opt...
blob
|
commitdiff
|
raw
|
diff to current
2009-05-25
Junio C Hamano
Merge branch 'sb/show-branch-parse-options' into sb...
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'
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 'jn/gitweb-cleanup'
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 'fc/decorate-tag'
blob
|
commitdiff
|
raw
|
diff to current
2009-05-23
Junio C Hamano
Merge branch 'tp/send-email-from-config'
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 'da/mergetool-lib'
blob
|
commitdiff
|
raw
|
diff to current
2009-05-23
Junio C Hamano
Merge branch 'cc/bisect' (early part)
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 'jm/format-patch-no-auto-n-when-k-is-given'
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-10
Dave Olszewski
merge-recursive: never leave index unmerged while recursing
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
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
Sync with GIT 1.6.2.5
blob
|
commitdiff
|
raw
|
diff to current
2009-05-03
Junio C Hamano
Merge branch 'maint-1.6.1' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-05-03
Junio C Hamano
Merge branch 'mm/maint-add-p-quit' 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'
blob
|
commitdiff
|
raw
|
diff to current
2009-04-29
Junio C Hamano
merge-recursive: do not die on a conflicting submodule
blob
|
commitdiff
|
raw
|
diff to current
next
projects / git / history
Junio C Hamano
Martin Renold
Linus Torvalds
Eric Wong
Dave Olszewski