projects
/
git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
shortlog: handle multi-line subjects like log --pretty=oneline et. al. do
[git]
/
builtin-merge-file.c
2008-12-22
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-12-22
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
2008-12-20
Junio C Hamano
Merge branch 'maint' to sync with GIT 1.6.0.6
blob
|
commitdiff
|
raw
2008-12-18
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
2008-12-17
Junio C Hamano
GIT 1.5.5.6
v1.5.5.6
blob
|
commitdiff
|
raw
|
diff to current
2008-12-16
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-12-13
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-12-11
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-12-10
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-12-07
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-12-03
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-12-03
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-12-02
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
2008-12-02
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
2008-12-01
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
2008-12-01
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
2008-12-01
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-11-28
Junio C Hamano
Merge branch 'js/mingw-rename-fix'
blob
|
commitdiff
|
raw
2008-11-28
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-11-27
Junio C Hamano
Merge branch 'rw/maint-typofix' into rw/typofix
blob
|
commitdiff
|
raw
2008-11-26
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-11-26
Junio C Hamano
Merge branch 'mm/maint-sort-config-doc' into mm/sort...
blob
|
commitdiff
|
raw
2008-11-24
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-11-17
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-11-16
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
2008-11-16
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-11-16
Junio C Hamano
Merge branch 'bc/maint-keep-pack'
blob
|
commitdiff
|
raw
2008-11-15
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-11-14
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-11-13
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
2008-11-13
Junio C Hamano
Merge branch 'jk/maint-commit-v-strip'
blob
|
commitdiff
|
raw
2008-11-13
Junio C Hamano
Merge branch 'mk/maint-cg-push'
blob
|
commitdiff
|
raw
2008-11-13
Junio C Hamano
Merge branch 'bc/maint-keep-pack'
blob
|
commitdiff
|
raw
2008-11-13
Junio C Hamano
Merge branch 'st/tag'
blob
|
commitdiff
|
raw
2008-11-13
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
2008-11-12
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-11-12
Junio C Hamano
Merge branch 'jk/maint-commit-v-strip' into jk/commit...
blob
|
commitdiff
|
raw
2008-11-11
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-11-09
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-11-09
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-11-05
Junio C Hamano
Merge branch 'mv/maint-branch-m-symref'
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 '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 '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 '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-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 '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
2008-10-19
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-10-18
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-10-18
Junio C Hamano
Merge branch 'pb/commit-where'
blob
|
commitdiff
|
raw
2008-10-17
Junio C Hamano
Merge branch 'jk/maint-ls-files-other' into jk/fix...
blob
|
commitdiff
|
raw
2008-10-17
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-10-13
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-10-12
Shawn O. Pearce
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-10-10
Shawn O. Pearce
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-10-09
Shawn O. Pearce
Merge branch 'js/objc-funchdr'
blob
|
commitdiff
|
raw
2008-10-09
Shawn O. Pearce
Merge branch 'pb/gitweb'
blob
|
commitdiff
|
raw
2008-10-09
Shawn O. Pearce
Merge branch 'dm/svn-branch'
blob
|
commitdiff
|
raw
2008-10-09
Shawn O. Pearce
Merge branch 'bc/xdiffnl'
blob
|
commitdiff
|
raw
2008-10-09
Shawn O. Pearce
Merge branch 'dp/cywginstat'
blob
|
commitdiff
|
raw
2008-10-09
Shawn O. Pearce
Merge branch 'lt/time-reject-fractional-seconds'
blob
|
commitdiff
|
raw
2008-10-09
Shawn O. Pearce
Merge branch 'jc/add-ita'
blob
|
commitdiff
|
raw
2008-10-09
Shawn O. Pearce
Merge branch 'mw/sendemail'
blob
|
commitdiff
|
raw
2008-10-09
Shawn O. Pearce
Merge branch 'mv/merge-refresh'
blob
|
commitdiff
|
raw
2008-10-09
Shawn O. Pearce
Merge branch 'ph/parseopt'
blob
|
commitdiff
|
raw
2008-10-09
Shawn O. Pearce
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-10-08
Shawn O. Pearce
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-10-06
Shawn O. Pearce
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-10-03
Pierre Habouzit
parse-opt: migrate builtin-merge-file.
blob
|
commitdiff
|
raw
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 'jc/better-conflict-resolution'
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-07
Junio C Hamano
Merge updated git-gui and gitk that call each other
blob
|
commitdiff
|
raw
|
diff to current
2008-09-06
Junio C Hamano
Merge branch 'maint' of git://repo.or.cz/git-gui into...
blob
|
commitdiff
|
raw
|
diff to current
2008-08-31
Junio C Hamano
Merge branch 'jc/maint-checkout-fix' into 'jc/better...
blob
|
commitdiff
|
raw
|
diff to current
2008-08-31
Junio C Hamano
merge.conflictstyle: choose between "merge" and "diff3...
blob
|
commitdiff
|
raw
|
diff to current
2008-08-31
Junio C Hamano
xmerge.c: "diff3 -m" style clips merge reduction level...
blob
|
commitdiff
|
raw
|
diff to current
2008-08-31
Junio C Hamano
xdiff-merge: optionally show conflicts in "diff3 -m...
blob
|
commitdiff
|
raw
|
diff to current
2008-08-17
Junio C Hamano
Merge git-gui 0.11.0
blob
|
commitdiff
|
raw
|
diff to current
2008-08-17
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2008-08-06
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
next