projects
/
git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Merge branch 'rs/blame'
[git]
/
builtin-merge.c
2008-11-09
Junio C Hamano
Merge branch 'rs/blame'
blob
|
commitdiff
|
raw
2008-11-05
Junio C Hamano
Merge branch 'jc/gitweb-fix-cloud-tag'
blob
|
commitdiff
|
raw
2008-11-05
Junio C Hamano
Merge branch 'mv/maint-branch-m-symref'
blob
|
commitdiff
|
raw
2008-11-05
Junio C Hamano
Merge branch 'mv/parseopt-checkout-index'
blob
|
commitdiff
|
raw
2008-11-04
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-11-03
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-11-03
Junio C Hamano
Merge branch 'np/index-pack'
blob
|
commitdiff
|
raw
2008-11-03
Junio C Hamano
Merge branch 'sh/rebase-i-p'
blob
|
commitdiff
|
raw
2008-11-03
Junio C Hamano
Merge branch 'cj/maint-gitpm-fix-maybe-self'
blob
|
commitdiff
|
raw
2008-11-02
Junio C Hamano
Merge branch 'js/maint-fetch-update-head' into maint
blob
|
commitdiff
|
raw
|
diff to current
2008-11-02
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-11-02
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
2008-11-02
Junio C Hamano
Merge branch 'maint' of git://repo.or.cz/git-gui into...
blob
|
commitdiff
|
raw
|
diff to current
2008-10-31
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-10-31
Junio C Hamano
Merge branch 'ar/maint-mksnpath' into ar/mksnpath
blob
|
commitdiff
|
raw
2008-10-27
Junio C Hamano
Merge branch 'ar/maint-mksnpath' into HEAD
blob
|
commitdiff
|
raw
2008-10-26
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-10-22
Junio C Hamano
Merge branch 'jk/diff-convfilter'
blob
|
commitdiff
|
raw
2008-10-22
Junio C Hamano
Merge branch 'js/maint-fetch-update-head'
blob
|
commitdiff
|
raw
2008-10-22
Junio C Hamano
Merge branch 'jc/maint-co-track'
blob
|
commitdiff
|
raw
2008-10-22
Junio C Hamano
Merge branch 'rs/alloc-ref'
blob
|
commitdiff
|
raw
2008-10-22
Junio C Hamano
Merge branch 'jk/fix-ls-files-other'
blob
|
commitdiff
|
raw
2008-10-21
Junio C Hamano
Merge branch 'jc/maint-reset-remove-unmerged-new'
blob
|
commitdiff
|
raw
2008-10-21
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-10-21
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-10-21
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
2008-10-19
Junio C Hamano
Merge branch 'sh/maint-rebase3'
blob
|
commitdiff
|
raw
2008-10-19
Junio C Hamano
Merge branch 'tr/workflow-doc'
blob
|
commitdiff
|
raw
2008-10-19
Junio C Hamano
Merge branch 'mv/clonev'
blob
|
commitdiff
|
raw
2008-10-19
Junio C Hamano
Merge branch 'ml/cygwin-filemode'
blob
|
commitdiff
|
raw
2008-10-19
Junio C Hamano
Merge branch 'gb/refactor-pathinfo'
blob
|
commitdiff
|
raw
2008-10-19
Junio C Hamano
Merge branch 'dp/checkattr'
blob
|
commitdiff
|
raw
2008-10-19
Junio C Hamano
Merge branch 'gb/formatpatch-autonbr'
blob
|
commitdiff
|
raw
2008-10-19
Junio C Hamano
Merge branch 'sp/describe-lwtag'
blob
|
commitdiff
|
raw
2008-10-19
Junio C Hamano
Merge branch 'ae/preservemerge'
blob
|
commitdiff
|
raw
2008-10-19
Junio C Hamano
Merge branch 'mv/merge-noff'
blob
|
commitdiff
|
raw
2008-10-19
Junio C Hamano
Merge branch 'ns/rebase-noverify'
blob
|
commitdiff
|
raw
|
diff to current
2008-10-19
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-10-18
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-10-18
Junio C Hamano
Merge branch 'db/maint-checkout-b' into maint
blob
|
commitdiff
|
raw
|
diff to current
2008-10-18
Junio C Hamano
Merge branch 'pb/commit-where'
blob
|
commitdiff
|
raw
|
diff to current
2008-10-17
Junio C Hamano
Merge branch 'jk/maint-ls-files-other' into jk/fix...
blob
|
commitdiff
|
raw
|
diff to current
2008-10-17
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-10-13
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-10-12
Shawn O. Pearce
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-10-12
Brandon Casey
Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT...
blob
|
commitdiff
|
raw
|
diff to current
2008-10-10
Shawn O. Pearce
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-10-09
Shawn O. Pearce
Merge branch 'js/objc-funchdr'
blob
|
commitdiff
|
raw
|
diff to current
2008-10-09
Shawn O. Pearce
Merge branch 'pb/gitweb'
blob
|
commitdiff
|
raw
|
diff to current
2008-10-09
Shawn O. Pearce
Merge branch 'dm/svn-branch'
blob
|
commitdiff
|
raw
|
diff to current
2008-10-09
Shawn O. Pearce
Merge branch 'bc/xdiffnl'
blob
|
commitdiff
|
raw
|
diff to current
2008-10-09
Shawn O. Pearce
Merge branch 'dp/cywginstat'
blob
|
commitdiff
|
raw
|
diff to current
2008-10-09
Shawn O. Pearce
Merge branch 'lt/time-reject-fractional-seconds'
blob
|
commitdiff
|
raw
|
diff to current
2008-10-09
Shawn O. Pearce
Merge branch 'jc/add-ita'
blob
|
commitdiff
|
raw
|
diff to current
2008-10-09
Shawn O. Pearce
Merge branch 'mw/sendemail'
blob
|
commitdiff
|
raw
|
diff to current
2008-10-09
Shawn O. Pearce
Merge branch 'mv/merge-refresh'
blob
|
commitdiff
|
raw
|
diff to current
2008-10-09
Shawn O. Pearce
Merge branch 'ph/parseopt'
blob
|
commitdiff
|
raw
|
diff to current
2008-10-09
Shawn O. Pearce
Merge branch 'rz/grepz'
blob
|
commitdiff
|
raw
|
diff to current
2008-10-09
Shawn O. Pearce
Merge branch 'mg/verboseprune'
blob
|
commitdiff
|
raw
|
diff to current
2008-10-09
Shawn O. Pearce
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-10-09
Shawn O. Pearce
Merge branch 'sg/maint-intrebase-msghook' into maint
blob
|
commitdiff
|
raw
|
diff to current
2008-10-09
Shawn O. Pearce
Merge branch 'jk/maint-soliconv' into maint
blob
|
commitdiff
|
raw
|
diff to current
2008-10-09
Brandon Casey
builtin-merge.c: allocate correct amount of memory
blob
|
commitdiff
|
raw
|
diff to current
2008-10-08
Shawn O. Pearce
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-10-08
Brandon Casey
Replace xmalloc/memset(0) pairs with xcalloc
blob
|
commitdiff
|
raw
|
diff to current
2008-10-06
Shawn O. Pearce
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-10-03
Miklos Vajna
builtin-commit: use reduce_heads() only when appropriate
blob
|
commitdiff
|
raw
|
diff to current
2008-10-03
Miklos Vajna
builtin-merge: refresh the index before calling a strategy
blob
|
commitdiff
|
raw
|
diff to current
2008-10-03
Shawn O. Pearce
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-10-01
Shawn O. Pearce
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-09-30
Shawn O. Pearce
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-09-29
Shawn O. Pearce
Merge branch 'bc/master-diff-hunk-header-fix'
blob
|
commitdiff
|
raw
|
diff to current
2008-09-29
Shawn O. Pearce
Merge branch 'maint' into bc/master-diff-hunk-header-fix
blob
|
commitdiff
|
raw
|
diff to current
2008-09-29
Shawn O. Pearce
Merge branch 'bc/maint-diff-hunk-header-fix' into maint
blob
|
commitdiff
|
raw
|
diff to current
2008-09-29
Shawn O. Pearce
Merge branch 'jc/better-conflict-resolution'
blob
|
commitdiff
|
raw
|
diff to current
2008-09-29
Shawn O. Pearce
Merge branch 'mg/maint-remote-fix' into maint
blob
|
commitdiff
|
raw
|
diff to current
2008-09-26
Shawn O. Pearce
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-09-25
Shawn O. Pearce
Merge branch 'mv/merge-recursive'
blob
|
commitdiff
|
raw
|
diff to current
2008-09-25
Shawn O. Pearce
Merge branch 'jc/alternate-push'
blob
|
commitdiff
|
raw
|
diff to current
2008-09-25
Shawn O. Pearce
Merge branch 'am/status'
blob
|
commitdiff
|
raw
|
diff to current
2008-09-25
Shawn O. Pearce
Merge branch 'pb/autocorrect-wrapper'
blob
|
commitdiff
|
raw
|
diff to current
2008-09-25
Shawn O. Pearce
Merge branch 'mv/commit-tree'
blob
|
commitdiff
|
raw
|
diff to current
2008-09-25
Shawn O. Pearce
Merge branch 'jc/apply-include-exclude'
blob
|
commitdiff
|
raw
|
diff to current
2008-09-25
Shawn O. Pearce
Merge branch 'jc/safe-c-l-d'
blob
|
commitdiff
|
raw
|
diff to current
2008-09-25
Shawn O. Pearce
Merge branch 'ho/dirstat-by-file'
blob
|
commitdiff
|
raw
|
diff to current
2008-09-25
Shawn O. Pearce
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2008-09-25
Shawn O. Pearce
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-09-24
Deskin Miller
maint: check return of split_cmdline to avoid bad confi...
blob
|
commitdiff
|
raw
|
diff to current
2008-09-23
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-09-23
Junio C Hamano
Merge branch 'bc/maint-diff-hunk-header-fix' into bc...
blob
|
commitdiff
|
raw
|
diff to current
2008-09-22
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-09-22
Junio C Hamano
Merge branch 'db/maint-checkout-b'
blob
|
commitdiff
|
raw
|
diff to current
2008-09-21
Junio C Hamano
Merge branch 'bc/maint-diff-hunk-header-fix' into bc...
blob
|
commitdiff
|
raw
|
diff to current
2008-09-20
Junio C Hamano
Merge branch 'bc/maint-diff-hunk-header-fix' into bc...
blob
|
commitdiff
|
raw
|
diff to current
2008-09-20
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-09-19
Junio C Hamano
Merge branch 'bc/maint-diff-hunk-header-fix' into bc...
blob
|
commitdiff
|
raw
|
diff to current
2008-09-19
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-09-19
Junio C Hamano
Merge branch 'jc/diff-prefix'
blob
|
commitdiff
|
raw
|
diff to current
2008-09-19
Junio C Hamano
Merge branch 'tr/rev-list-reverse'
blob
|
commitdiff
|
raw
|
diff to current
2008-09-19
Junio C Hamano
Merge branch 'cc/bisect'
blob
|
commitdiff
|
raw
|
diff to current
next