projects
/
git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Custom low-level merge driver support.
[git]
/
t
/
t6021-merge-criss-cross.sh
2007-03-22
Junio C Hamano
Merge git://git2.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
2007-03-20
Junio C Hamano
Merge git://git2.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
2007-03-13
Junio C Hamano
Merge branch 'master' of git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
2007-03-12
Junio C Hamano
Merge branch 'maint' of git://repo.or.cz/git-gui into...
blob
|
commitdiff
|
raw
2007-03-06
Junio C Hamano
Merge branch 'master' of git://repo.or.cz/git-gui into...
blob
|
commitdiff
|
raw
2007-02-25
Junio C Hamano
Merge git://repo.or.cz/git-gui into maint
blob
|
commitdiff
|
raw
2007-02-21
Junio C Hamano
Merge branch 'master' of git://repo.or.cz/git-gui into...
blob
|
commitdiff
|
raw
2007-02-18
Junio C Hamano
Merge git://git./pub/scm/gitk/gitk into maint
blob
|
commitdiff
|
raw
2007-02-13
Junio C Hamano
Merge branch 'master' of git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
2007-02-13
Junio C Hamano
Merge branch 'master' of git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
2007-02-12
Junio C Hamano
Merge git-gui
blob
|
commitdiff
|
raw
2007-01-15
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
2007-01-14
Shawn O. Pearce
Merge branch 'master' into sp/fast-import
blob
|
commitdiff
|
raw
2006-11-29
Junio C Hamano
Merge master.kernel.org:/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
2006-11-24
Junio C Hamano
Merge branch 'jc/upload-pack'
blob
|
commitdiff
|
raw
2006-11-13
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2006-11-12
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2006-11-11
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2006-11-09
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2006-11-09
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2006-11-08
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
2006-11-08
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2006-11-08
Junio C Hamano
Merge branch 'jc/pickaxe'
blob
|
commitdiff
|
raw
2006-11-07
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2006-11-05
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2006-11-05
Junio C Hamano
Merge branch 'pb/web'
blob
|
commitdiff
|
raw
2006-11-04
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2006-11-03
Junio C Hamano
Merge branch 'sp/keep-pack' into np/index-pack
blob
|
commitdiff
|
raw
2006-11-03
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2006-11-01
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2006-11-01
Junio C Hamano
Merge branch 'rs/cherry'
blob
|
commitdiff
|
raw
2006-11-01
Junio C Hamano
Merge branch 'jc/refs-and-fetch'
blob
|
commitdiff
|
raw
2006-11-01
Junio C Hamano
Merge branch 'lj/refs'
blob
|
commitdiff
|
raw
2006-10-31
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2006-10-29
Junio C Hamano
Merge early part of branch 'np/index-pack' into sp...
blob
|
commitdiff
|
raw
2006-10-27
Junio C Hamano
tests: merge-recursive is usable without Python
blob
|
commitdiff
|
raw
2006-09-01
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2006-08-13
Junio C Hamano
Merge branch 'jc/upload-pack'
blob
|
commitdiff
|
raw
|
diff to current
2006-08-13
Junio C Hamano
Merge branch 'th/diff-extra'
blob
|
commitdiff
|
raw
|
diff to current
2006-08-13
Junio C Hamano
GIT 1.4.2
v1.4.2
blob
|
commitdiff
|
raw
|
diff to current
2006-08-13
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2006-08-08
Junio C Hamano
Merge branch 'master' into pb/gitpm
blob
|
commitdiff
|
raw
|
diff to current
2006-07-30
Junio C Hamano
Merge branch 'jn/make'
blob
|
commitdiff
|
raw
|
diff to current
2006-07-26
Junio C Hamano
Merge branch 'pb/configure'
blob
|
commitdiff
|
raw
|
diff to current
2006-07-13
Junio C Hamano
Merge branch 'ml/trace'
blob
|
commitdiff
|
raw
|
diff to current
2006-07-13
Junio C Hamano
Merge branch 'js/merge-base'
blob
|
commitdiff
|
raw
|
diff to current
2006-07-13
Junio C Hamano
Merge branch 'lt/prune'
blob
|
commitdiff
|
raw
|
diff to current
2006-07-13
Junio C Hamano
Merge branch 'lt/merge-tree'
blob
|
commitdiff
|
raw
|
diff to current
2006-07-10
Junio C Hamano
Merge branch 'jc/show-merge'
blob
|
commitdiff
|
raw
|
diff to current
2006-07-10
Pavel Roskin
Fix more typos, primarily in the code
blob
|
commitdiff
|
raw
|
diff to current
2006-06-13
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2006-06-10
Junio C Hamano
Merge git://git.kernel.org/pub/scm/git/gitweb
blob
|
commitdiff
|
raw
|
diff to current
2006-06-07
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2006-06-04
Junio C Hamano
Merge branch 'new' of git://git./gitk/gitk into next
blob
|
commitdiff
|
raw
|
diff to current
2006-06-01
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2006-05-03
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2006-04-24
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2006-04-17
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2006-04-07
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2006-04-07
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2006-04-05
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2006-04-05
Junio C Hamano
Merge branch 'fix'
blob
|
commitdiff
|
raw
|
diff to current
2006-04-04
Junio C Hamano
Merge branch 'lt/fix-sol-pack'
blob
|
commitdiff
|
raw
|
diff to current
2006-04-04
Junio C Hamano
Merge branch 'lt/fix-sol-pack' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-04-02
Junio C Hamano
Merge branch 'lt/fix-sol-pack' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-03-31
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2006-03-26
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2006-03-04
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2006-03-02
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2006-03-02
Junio C Hamano
Merge branch 'jc/tag'
blob
|
commitdiff
|
raw
|
diff to current
2006-03-02
Junio C Hamano
Merge branch 'jc/tag' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-03-02
Junio C Hamano
Up to date with GIT 1.2.4 fixes
blob
|
commitdiff
|
raw
|
diff to current
2006-03-01
Junio C Hamano
Merge git-mv fixes from 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2006-02-26
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2006-02-25
Junio C Hamano
Merge branches 'jc/rev-list' and 'jc/pack-thin'
blob
|
commitdiff
|
raw
|
diff to current
2006-02-25
Junio C Hamano
Merge branches 'jc/rev-list' and 'jc/pack-thin'
blob
|
commitdiff
|
raw
|
diff to current
2006-02-24
Junio C Hamano
Merge fixes early for next maint series.
blob
|
commitdiff
|
raw
|
diff to current
2006-02-24
Junio C Hamano
Merge branches 'jc/rev-list' and 'jc/pack-thin' into...
blob
|
commitdiff
|
raw
|
diff to current
2006-02-24
Junio C Hamano
Merge fix bits from jc/rev-list
blob
|
commitdiff
|
raw
|
diff to current
2006-02-24
Junio C Hamano
Merge fixes early for next maint series.
blob
|
commitdiff
|
raw
|
diff to current
2006-02-23
Junio C Hamano
Merge part of pack-thin branch
blob
|
commitdiff
|
raw
|
diff to current
2006-02-23
Junio C Hamano
Merge branches 'maint', 'jc/fix-co-candy' and 'jc/fix...
blob
|
commitdiff
|
raw
|
diff to current
2006-02-23
Junio C Hamano
Merge branch 'ra/anno'
blob
|
commitdiff
|
raw
|
diff to current
2006-02-23
Junio C Hamano
Merge fixes up to GIT 1.2.3
blob
|
commitdiff
|
raw
|
diff to current
2006-02-22
Junio C Hamano
Merge branch 'ra/anno' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-02-22
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2006-02-22
Junio C Hamano
Merge branch 'fix'
blob
|
commitdiff
|
raw
|
diff to current
2006-02-22
Junio C Hamano
Merge branch 'jc/perl'
blob
|
commitdiff
|
raw
|
diff to current
2006-02-22
Junio C Hamano
Merge branch 'jc/pack-reuse'
blob
|
commitdiff
|
raw
|
diff to current
2006-02-22
Junio C Hamano
Merge branch 'jc/nostat'
blob
|
commitdiff
|
raw
|
diff to current
2006-02-21
Junio C Hamano
Merge part of jc/portable branch
blob
|
commitdiff
|
raw
|
diff to current
2006-02-20
Junio C Hamano
Merge branch 'jc/perl' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-02-20
Junio C Hamano
Merge branch 'ra/anno' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-02-20
Junio C Hamano
Merge branch 'jc/pack-thin' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-02-20
Junio C Hamano
Merge branch 'jc/pack-thin' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-02-20
Junio C Hamano
Merge branch 'jc/rev-list' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-02-20
Junio C Hamano
Merge branch 'jc/merge-msg' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-02-19
Junio C Hamano
Merge branch 'jc/mv' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-02-19
Junio C Hamano
Merge part of js/portable into next
blob
|
commitdiff
|
raw
|
diff to current
2006-02-19
Johannes Schindelin
Optionally work without python
blob
|
commitdiff
|
raw
|
diff to current
next