projects
/
git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅ next
xdl_merge(): fix and simplify conflict handling
[git]
/
t
/
t4002-diff-basic.sh
2006-11-29
Junio C Hamano
Merge master.kernel.org:/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
2006-11-08
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
2006-09-01
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
2006-08-13
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
2006-06-18
Junio C Hamano
Merge branch 'jc/rw-prefix'
blob
|
commitdiff
|
raw
2006-06-13
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
2006-06-10
Junio C Hamano
Merge git://git.kernel.org/pub/scm/git/gitweb
blob
|
commitdiff
|
raw
2006-06-07
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
2006-06-04
Junio C Hamano
Merge branch 'new' of git://git./gitk/gitk into next
blob
|
commitdiff
|
raw
2006-06-01
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
2006-05-29
Junio C Hamano
Merge branch 'jc/dirwalk-n-cache-tree' into jc/cache...
blob
|
commitdiff
|
raw
2006-05-28
Junio C Hamano
Merge branch 'jc/cache-tree' into next
blob
|
commitdiff
|
raw
2006-05-24
Junio C Hamano
Merge branch 'master' into sp/reflog
blob
|
commitdiff
|
raw
2006-05-24
Junio C Hamano
Merge branch 'lt/dirwalk'
blob
|
commitdiff
|
raw
2006-05-23
Junio C Hamano
Merge branch 'sp/reflog' into next
blob
|
commitdiff
|
raw
2006-05-21
Junio C Hamano
Merge branch 'master' into js/fmt-patch
blob
|
commitdiff
|
raw
2006-05-20
Junio C Hamano
Merge branch 'lt/dirwalk' into jc/dirwalk-n-cache-tree
blob
|
commitdiff
|
raw
2006-05-20
Junio C Hamano
Merge branch 'jc/cache-tree' into jc/dirwalk-n-cache...
blob
|
commitdiff
|
raw
2006-05-20
Junio C Hamano
Merge branch 'js/fetchconfig'
blob
|
commitdiff
|
raw
2006-05-20
Junio C Hamano
Merge branch 'lt/dirwalk' into next
blob
|
commitdiff
|
raw
2006-05-20
Junio C Hamano
Merge branch 'jc/read-tree-safety'
blob
|
commitdiff
|
raw
2006-05-19
Junio C Hamano
Merge branch 'eb/quilt' into next
blob
|
commitdiff
|
raw
2006-05-19
Junio C Hamano
Merge branch 'ts/doctar' into next
blob
|
commitdiff
|
raw
2006-05-19
Junio C Hamano
Merge branch 'lt/dirwalk' into next
blob
|
commitdiff
|
raw
2006-05-18
Junio C Hamano
Merge branch 'lt/dirwalk' into next
blob
|
commitdiff
|
raw
2006-05-18
Junio C Hamano
Merge branch 'master' into next
blob
|
commitdiff
|
raw
2006-05-18
Junio C Hamano
Merge branch 'lt/dirwalk' into next
blob
|
commitdiff
|
raw
2006-05-18
Junio C Hamano
Merge branch 'sp/reflog' into next
blob
|
commitdiff
|
raw
2006-05-17
Junio C Hamano
Merge branch 'jc/apply' into next
blob
|
commitdiff
|
raw
2006-05-17
Junio C Hamano
Merge branch 'jc/read-tree-safety' into next
blob
|
commitdiff
|
raw
2006-05-17
Junio C Hamano
read-tree -m -u: do not overwrite or remove untracked...
blob
|
commitdiff
|
raw
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-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
2005-09-27
Junio C Hamano
Merge http://www.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2005-09-08
Junio C Hamano
Big tool rename.
blob
|
commitdiff
|
raw
|
diff to current
2005-08-30
Junio C Hamano
Merge refs/heads/master from paulus
blob
|
commitdiff
|
raw
|
diff to current
2005-08-19
Junio C Hamano
Merge from gitk
blob
|
commitdiff
|
raw
|
diff to current
2005-08-18
Junio C Hamano
Merge with gitk --parents change.
blob
|
commitdiff
|
raw
|
diff to current
2005-08-18
Junio C Hamano
Merge with gitk
blob
|
commitdiff
|
raw
|
diff to current
2005-08-12
Junio C Hamano
Merge changes in the master branch into 0.99.5 preparat...
blob
|
commitdiff
|
raw
|
diff to current
2005-08-12
Pavel Roskin
[PATCH] Trapping exit in tests, using return for errors
blob
|
commitdiff
|
raw
|
diff to current
2005-08-12
Junio C Hamano
Merge with gitk.
blob
|
commitdiff
|
raw
|
diff to current
2005-08-10
Junio C Hamano
Merge with gitk.
blob
|
commitdiff
|
raw
|
diff to current
2005-08-09
Junio C Hamano
Merge with gitk.
blob
|
commitdiff
|
raw
|
diff to current
2005-08-08
Junio C Hamano
Merge with gitk.
blob
|
commitdiff
|
raw
|
diff to current
2005-08-07
Junio C Hamano
Merge with gitk.
blob
|
commitdiff
|
raw
|
diff to current
2005-08-06
Junio C Hamano
Merge with gitk.
blob
|
commitdiff
|
raw
|
diff to current
2005-08-05
Junio C Hamano
Merge with gitk.
blob
|
commitdiff
|
raw
|
diff to current
2005-07-31
Junio C Hamano
Merge with gitk.
blob
|
commitdiff
|
raw
|
diff to current
2005-07-29
Junio C Hamano
Merge with gitk.
blob
|
commitdiff
|
raw
|
diff to current
2005-07-26
Junio C Hamano
Adjust diff-raw tests to the status letter change.
blob
|
commitdiff
|
raw
|
diff to current
2005-07-18
Linus Torvalds
Merge master.kernel.org:/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2005-07-16
Linus Torvalds
Merge git-tools repository under "tools" subdirectory
blob
|
commitdiff
|
raw
|
diff to current
2005-07-06
Linus Torvalds
Merge master.kernel.org:/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2005-06-28
Linus Torvalds
Merge rsync://rsync.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2005-06-22
Linus Torvalds
Do a cross-project merge of Paul Mackerras' gitk visualizer
blob
|
commitdiff
|
raw
|
diff to current
2005-05-23
Junio C Hamano
[PATCH] diff-raw format update take #2.
blob
|
commitdiff
|
raw
|
diff to current
2005-05-22
Junio C Hamano
[PATCH] The diff-raw format updates.
blob
|
commitdiff
|
raw
|
diff to current
2005-05-20
Junio C Hamano
[PATCH] Diff-files fix with more tests.
blob
|
commitdiff
|
raw
|
diff to current
2005-05-20
Junio C Hamano
[PATCH] Add tests for diff-tree
blob
|
commitdiff
|
raw
|
diff to current