projects
/
git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Add a demonstration/test of customized merge.
[git]
/
t
/
t1001-read-tree-m-2way.sh
2007-04-09
Junio C Hamano
Merge branch 'js/fetch-progress'
blob
|
commitdiff
|
raw
2007-04-04
Junio C Hamano
Merge 1.5.0.7 in
blob
|
commitdiff
|
raw
2007-03-30
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2007-03-28
Junio C Hamano
Merge branch 'maint' to synchronize with 1.5.0.6
blob
|
commitdiff
|
raw
2007-03-25
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2007-03-25
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2007-03-24
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2007-03-22
Junio C Hamano
Merge git://git2.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
2007-03-22
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2007-03-20
Junio C Hamano
Merge git://git2.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
2007-03-18
Junio C Hamano
Merge 1.5.0.5 in from 'maint'
blob
|
commitdiff
|
raw
2007-03-17
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2007-03-14
Junio C Hamano
Merge GIT 1.5.0.4
blob
|
commitdiff
|
raw
2007-03-14
Junio C Hamano
Merge branch 'jc/fetch'
blob
|
commitdiff
|
raw
2007-03-14
Junio C Hamano
Merge branch 'jb/per-user-exclude'
blob
|
commitdiff
|
raw
2007-03-14
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2007-03-13
Junio C Hamano
Merge branch 'master' of git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
2007-03-13
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2007-03-12
Shawn O. Pearce
Merge branch 'maint'
blob
|
commitdiff
|
raw
2007-03-12
Junio C Hamano
Merge branch 'maint' of git://repo.or.cz/git-gui into...
blob
|
commitdiff
|
raw
|
diff to current
2007-03-12
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2007-03-12
Junio C Hamano
Merge branch 'jc/boundary'
blob
|
commitdiff
|
raw
2007-03-11
Junio C Hamano
Merge branch 'js/attach'
blob
|
commitdiff
|
raw
2007-03-11
Junio C Hamano
Merge branch 'js/diff-ni'
blob
|
commitdiff
|
raw
2007-03-06
Junio C Hamano
Merge branch 'master' of git://repo.or.cz/git-gui into...
blob
|
commitdiff
|
raw
|
diff to current
2007-03-04
Johannes Schindelin
Get rid of the dependency to GNU diff in the tests
blob
|
commitdiff
|
raw
2007-02-25
Junio C Hamano
Merge git://repo.or.cz/git-gui into maint
blob
|
commitdiff
|
raw
|
diff to current
2007-02-21
Junio C Hamano
Merge branch 'master' of git://repo.or.cz/git-gui into...
blob
|
commitdiff
|
raw
|
diff to current
2007-02-18
Junio C Hamano
Merge git://git./pub/scm/gitk/gitk into maint
blob
|
commitdiff
|
raw
|
diff to current
2007-02-13
Junio C Hamano
Merge branch 'master' of git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2007-02-13
Junio C Hamano
Merge branch 'master' of git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2007-02-12
Junio C Hamano
Merge git-gui
blob
|
commitdiff
|
raw
|
diff to current
2007-01-15
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2006-11-29
Junio C Hamano
Merge master.kernel.org:/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2006-11-08
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
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 git://git.kernel.org/pub/scm/gitk/gitk
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-19
Junio C Hamano
Merge part of 'js/fmt-patch' for RFC2822 dates into...
blob
|
commitdiff
|
raw
|
diff to current
2006-05-18
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2006-05-17
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2006-05-15
Junio C Hamano
Merge branch 'fix'
blob
|
commitdiff
|
raw
|
diff to current
2006-05-15
Junio C Hamano
Merge branch 'fix'
blob
|
commitdiff
|
raw
|
diff to current
2006-05-14
Junio C Hamano
Merge branch 'fix'
blob
|
commitdiff
|
raw
|
diff to current
2006-05-14
Junio C Hamano
Merge branch 'fix'
blob
|
commitdiff
|
raw
|
diff to current
2006-05-13
Junio C Hamano
Merge branch 'lt/fix-config' into lt/config
blob
|
commitdiff
|
raw
|
diff to current
2006-05-10
Junio C Hamano
Merge branch 'fix'
blob
|
commitdiff
|
raw
|
diff to current
2006-05-09
Junio C Hamano
Merge branch 'np/delta'
blob
|
commitdiff
|
raw
|
diff to current
2006-05-09
Junio C Hamano
Merge branch 'fix'
blob
|
commitdiff
|
raw
|
diff to current
2006-05-08
Junio C Hamano
Merge branch 'fix'
blob
|
commitdiff
|
raw
|
diff to current
2006-05-07
Junio C Hamano
Merge branch 'fix'
blob
|
commitdiff
|
raw
|
diff to current
2006-05-06
Junio C Hamano
Merge branch 'master' into js/fmt-patch
blob
|
commitdiff
|
raw
|
diff to current
2006-05-05
Junio C Hamano
Merge branch 'js/fmt-patch' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-05-05
Junio C Hamano
Merge branch 'fix'
blob
|
commitdiff
|
raw
|
diff to current
2006-05-04
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2006-05-04
Junio C Hamano
Merge branch 'fix'
blob
|
commitdiff
|
raw
|
diff to current
2006-05-03
Junio C Hamano
Merge branch 'np/delta' into next
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-05-02
Junio C Hamano
Merge branch 'fix'
blob
|
commitdiff
|
raw
|
diff to current
2006-05-01
Junio C Hamano
Merge branch 'jc/fmt-patch' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-04-30
Martin Langhoff
Merge with git://kernel.org/pub/scm/git/git.git
blob
|
commitdiff
|
raw
|
diff to current
2006-04-30
Junio C Hamano
Merge branch 'fix'
blob
|
commitdiff
|
raw
|
diff to current
2006-04-29
Junio C Hamano
Merge branch 'np/delta' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-04-28
Junio C Hamano
Merge branch 'fix'
blob
|
commitdiff
|
raw
|
diff to current
2006-04-28
Junio C Hamano
Merge branch 'np/delta' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-04-27
Junio C Hamano
Merge branch 'fix'
blob
|
commitdiff
|
raw
|
diff to current
2006-04-27
Junio C Hamano
Merge branch 'pb/config'
blob
|
commitdiff
|
raw
|
diff to current
2006-04-27
Junio C Hamano
Merge branch 'fix'
blob
|
commitdiff
|
raw
|
diff to current
2006-04-26
Junio C Hamano
Merge branch 'master' into jc/cache-tree
blob
|
commitdiff
|
raw
|
diff to current
2006-04-26
Junio C Hamano
Merge branch 'pb/config' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-04-26
Junio C Hamano
Merge branch 'jc/diff'
blob
|
commitdiff
|
raw
|
diff to current
2006-04-26
Junio C Hamano
Merge branch 'jc/cache-tree' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-04-25
Junio C Hamano
Merge branch 'pb/config' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-04-25
Junio C Hamano
Merge branch 'np/delta' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-04-25
Junio C Hamano
Merge branch 'jc/cache-tree' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-04-24
Junio C Hamano
Merge branch 'master' into next
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-24
Junio C Hamano
Merge part of 'jc/cache-tree'
blob
|
commitdiff
|
raw
|
diff to current
2006-04-24
Junio C Hamano
Merge branch 'ar/chmod-series' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-04-22
Junio C Hamano
Merge branch 'jc/diff' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-04-22
Junio C Hamano
Libify diff-files.
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-05
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
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-02-22
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2006-02-07
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2005-12-07
Junio C Hamano
Merge http://www.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2005-11-29
Junio C Hamano
Merge http://www.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2005-11-28
Junio C Hamano
Merge http://www.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2005-11-27
Junio C Hamano
Merge http://www.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2005-11-22
Junio C Hamano
Merge http://www.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2005-11-20
Junio C Hamano
Merge http://www.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2005-11-19
Junio C Hamano
Merge http://www.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2005-10-27
Junio C Hamano
Merge http://www.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
next