projects
/
git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Merge branch 'kc/maint-diff-bwi-fix'
[git]
/
merge-recursive.c
2009-01-20
Junio C Hamano
Merge branch 'kc/maint-diff-bwi-fix'
blob
|
commitdiff
|
raw
2009-01-18
Junio C Hamano
Merge branch 'ds/uintmax-config'
blob
|
commitdiff
|
raw
2009-01-18
Junio C Hamano
Merge branch 'gb/gitweb-opml'
blob
|
commitdiff
|
raw
2009-01-18
Junio C Hamano
Merge branch 'mv/apply-parse-opt'
blob
|
commitdiff
|
raw
2009-01-18
Junio C Hamano
Merge branch 'tr/rebase-root'
blob
|
commitdiff
|
raw
2009-01-18
Junio C Hamano
Merge branch 'gb/gitweb-patch'
blob
|
commitdiff
|
raw
2009-01-18
Junio C Hamano
Merge branch 'jc/maint-format-patch'
blob
|
commitdiff
|
raw
2009-01-18
Junio C Hamano
Merge branch 'tr/maint-no-index-fixes'
blob
|
commitdiff
|
raw
2009-01-18
Junio C Hamano
Merge branch 'as/autocorrect-alias'
blob
|
commitdiff
|
raw
2009-01-18
Junio C Hamano
Merge branch 'rs/maint-shortlog-foldline'
blob
|
commitdiff
|
raw
2009-01-18
Junio C Hamano
Merge branch 'mh/maint-commit-color-status'
blob
|
commitdiff
|
raw
2009-01-18
Junio C Hamano
Merge branch 'maint-1.6.0' into maint
blob
|
commitdiff
|
raw
2009-01-15
Junio C Hamano
Merge branch 'maint-1.6.0' into maint
blob
|
commitdiff
|
raw
2009-01-15
Junio C Hamano
Merge branch 'maint-1.6.0' into maint
blob
|
commitdiff
|
raw
2009-01-14
Junio C Hamano
Merge branch 'maint-1.6.0' into maint
blob
|
commitdiff
|
raw
2009-01-14
Junio C Hamano
Merge branch 'nd/grep-assume-unchanged'
blob
|
commitdiff
|
raw
2009-01-14
Junio C Hamano
Merge branch 'as/maint-shortlog-cleanup'
blob
|
commitdiff
|
raw
2009-01-14
Junio C Hamano
Merge branch 'jc/maint-ls-tree'
blob
|
commitdiff
|
raw
2009-01-14
Junio C Hamano
Merge branch 'js/bundle-tags'
blob
|
commitdiff
|
raw
2009-01-14
Junio C Hamano
Merge branch 'js/add-not-submodule'
blob
|
commitdiff
|
raw
2009-01-14
Junio C Hamano
Merge branch 'pb/maint-git-pm-false-dir'
blob
|
commitdiff
|
raw
2009-01-14
Junio C Hamano
Merge branch 'pj/maint-ldflags'
blob
|
commitdiff
|
raw
2009-01-14
Junio C Hamano
Merge branch 'fe/cvsserver'
blob
|
commitdiff
|
raw
2009-01-14
Junio C Hamano
Merge branch 'js/maint-bisect-gitk'
blob
|
commitdiff
|
raw
2009-01-14
Junio C Hamano
Merge branch 'np/no-loosen-prune-expire-now'
blob
|
commitdiff
|
raw
2009-01-14
Junio C Hamano
Merge branch 'cb/maint-unpack-trees-absense'
blob
|
commitdiff
|
raw
2009-01-14
Junio C Hamano
Merge branch 'mc/cd-p-pwd'
blob
|
commitdiff
|
raw
2009-01-14
Junio C Hamano
Merge branch 'mh/cherry-default'
blob
|
commitdiff
|
raw
2009-01-13
Junio C Hamano
Merge branch 'kk/maint-http-push' into maint
blob
|
commitdiff
|
raw
2009-01-13
Junio C Hamano
Merge branch 'js/maint-merge-recursive-r-d-conflict...
blob
|
commitdiff
|
raw
2009-01-13
Junio C Hamano
Merge branch 'cb/maint-merge-recursive-fix' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-01-13
Junio C Hamano
Merge branch 'ap/maint-apply-modefix' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-01-13
Junio C Hamano
Merge branch 'maint-1.6.0' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-01-12
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2009-01-12
Junio C Hamano
Merge branch 'jc/maint-do-not-switch-to-non-commit...
blob
|
commitdiff
|
raw
|
diff to current
2009-01-07
Junio C Hamano
Merge branch 'mh/maint-sendmail-cc-doc'
blob
|
commitdiff
|
raw
2009-01-07
Junio C Hamano
Merge branch 'rs/diff-ihc'
blob
|
commitdiff
|
raw
2009-01-07
Junio C Hamano
Merge branch 'js/maint-merge-recursive-r-d-conflict'
blob
|
commitdiff
|
raw
2009-01-07
Junio C Hamano
Merge branch 'mk/gitweb-feature'
blob
|
commitdiff
|
raw
|
diff to current
2009-01-07
Junio C Hamano
Merge branch 'cb/merge-recursive-fix'
blob
|
commitdiff
|
raw
|
diff to current
2009-01-07
Junio C Hamano
Merge branch 'wp/add-p-goto'
blob
|
commitdiff
|
raw
|
diff to current
2009-01-07
Junio C Hamano
Merge branch 'maint-1.6.0' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-01-03
Junio C Hamano
Merge branch 'jc/maint-do-not-switch-to-non-commit'
blob
|
commitdiff
|
raw
|
diff to current
2009-01-03
Junio C Hamano
Merge branch 'ap/maint-apply-modefix'
blob
|
commitdiff
|
raw
|
diff to current
2009-01-01
Junio C Hamano
Merge branch 'cb/mergetool'
blob
|
commitdiff
|
raw
|
diff to current
2008-12-29
Junio C Hamano
Merge branch 'lt/reset-merge'
blob
|
commitdiff
|
raw
|
diff to current
2008-12-27
Junio C Hamano
Merge branch 'sp/maint-describe-all-tag-warning' into...
blob
|
commitdiff
|
raw
|
diff to current
2008-12-25
Johannes Schindelin
merge-recursive: mark rename/delete conflict as unmerged
blob
|
commitdiff
|
raw
|
diff to current
2008-12-22
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-12-22
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2008-12-20
Junio C Hamano
Merge branch 'maint' to sync with GIT 1.6.0.6
blob
|
commitdiff
|
raw
|
diff to current
2008-12-18
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2008-12-17
Junio C Hamano
GIT 1.5.5.6
v1.5.5.6
blob
|
commitdiff
|
raw
2008-12-16
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-12-15
Junio C Hamano
Merge branch 'cb/maint-merge-recursive-fix' into cb...
blob
|
commitdiff
|
raw
|
diff to current
2008-12-13
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-12-11
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-12-10
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-12-07
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-12-06
Junio C Hamano
Merge branch 'jc/am-options'
blob
|
commitdiff
|
raw
|
diff to current
2008-12-05
Alex Riesen
Report symlink failures in merge-recursive
blob
|
commitdiff
|
raw
|
diff to current
2008-12-03
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-12-03
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-12-02
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2008-12-02
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2008-12-01
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2008-12-01
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2008-12-01
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-11-29
Junio C Hamano
Merge branch 'nd/narrow' (early part) into jc/add-i-t-a
blob
|
commitdiff
|
raw
|
diff to current
2008-11-28
Junio C Hamano
Merge branch 'cc/bisect-skip'
blob
|
commitdiff
|
raw
|
diff to current
2008-11-28
Junio C Hamano
Merge branch 'js/mingw-rename-fix'
blob
|
commitdiff
|
raw
|
diff to current
2008-11-28
Junio C Hamano
Merge branch 'st/levenshtein'
blob
|
commitdiff
|
raw
|
diff to current
2008-11-28
Junio C Hamano
Merge branch 'cr/remote-update-v'
blob
|
commitdiff
|
raw
|
diff to current
2008-11-28
Junio C Hamano
Merge branch 'rs/strbuf-expand'
blob
|
commitdiff
|
raw
|
diff to current
2008-11-28
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-11-27
Junio C Hamano
Merge branch 'rw/maint-typofix' into rw/typofix
blob
|
commitdiff
|
raw
|
diff to current
2008-11-26
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-11-26
Junio C Hamano
Merge branch 'mm/maint-sort-config-doc' into mm/sort...
blob
|
commitdiff
|
raw
|
diff to current
2008-11-24
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-11-24
René Scharfe
merge-recursive: use strbuf_expand() instead of interpo...
blob
|
commitdiff
|
raw
|
diff to current
2008-11-17
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-11-16
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2008-11-16
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-11-16
Junio C Hamano
Merge branch 'bc/maint-keep-pack'
blob
|
commitdiff
|
raw
|
diff to current
2008-11-15
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-11-14
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-11-13
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2008-11-13
Junio C Hamano
Merge branch 'jn/gitweb-customlinks'
blob
|
commitdiff
|
raw
|
diff to current
2008-11-13
Junio C Hamano
Merge branch 'jk/maint-commit-v-strip'
blob
|
commitdiff
|
raw
|
diff to current
2008-11-13
Junio C Hamano
Merge branch 'mk/maint-cg-push'
blob
|
commitdiff
|
raw
|
diff to current
2008-11-13
Junio C Hamano
Merge branch 'bc/maint-keep-pack'
blob
|
commitdiff
|
raw
|
diff to current
2008-11-13
Junio C Hamano
Merge branch 'st/tag'
blob
|
commitdiff
|
raw
|
diff to current
2008-11-13
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2008-11-12
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-11-12
Junio C Hamano
Merge branch 'jk/maint-commit-v-strip' into jk/commit...
blob
|
commitdiff
|
raw
|
diff to current
2008-11-11
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-11-09
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-11-09
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-11-09
Junio C Hamano
Merge branch 'rs/blame'
blob
|
commitdiff
|
raw
|
diff to current
2008-11-05
Junio C Hamano
Merge branch 'jc/gitweb-fix-cloud-tag'
blob
|
commitdiff
|
raw
|
diff to current
next