tokkee.org
Code
projects
/
git.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
t5520-pull: Add testcases showing spurious conflicts from git pull --rebase
[git.git]
/
ll-merge.h
2010-02-12
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2010-02-12
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2010-02-10
Junio C Hamano
Sync with 1.6.6.2
blob
|
commitdiff
|
raw
2010-02-09
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2010-02-07
Junio C Hamano
Merge git://repo.or.cz/git-gui
v1.7.0-rc2
blob
|
commitdiff
|
raw
2010-02-07
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2010-02-06
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
2010-02-06
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2010-02-01
Junio C Hamano
Merge branch 'sp/maint-fast-import-large-blob' into...
blob
|
commitdiff
|
raw
2010-01-30
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2010-01-29
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
2010-01-28
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2010-01-28
Junio C Hamano
Merge branch 'gp/maint-cvsserver'
blob
|
commitdiff
|
raw
2010-01-27
Junio C Hamano
Merge branch 'jc/maint-reflog-bad-timestamp'
blob
|
commitdiff
|
raw
2010-01-27
Junio C Hamano
Merge branch 'il/maint-colon-address'
blob
|
commitdiff
|
raw
2010-01-27
Junio C Hamano
Merge branch 'il/maint-xmallocz'
blob
|
commitdiff
|
raw
2010-01-27
Junio C Hamano
Merge branch 'jh/maint-config-file-prefix'
blob
|
commitdiff
|
raw
2010-01-25
Junio C Hamano
Merge branch 'jc/fix-tree-walk'
blob
|
commitdiff
|
raw
2010-01-24
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2010-01-24
Junio C Hamano
Merge branch 'maint' of git://git.spearce.org/git-gui...
blob
|
commitdiff
|
raw
|
diff to current
2010-01-24
Junio C Hamano
Merge branch 'doc-style/for-next' of git://repo.or...
blob
|
commitdiff
|
raw
2010-01-23
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2010-01-23
Junio C Hamano
Merge branch 'jc/branch-d'
blob
|
commitdiff
|
raw
2010-01-23
Junio C Hamano
Merge branch 'il/rev-glob'
blob
|
commitdiff
|
raw
2010-01-23
Junio C Hamano
Merge branch 'js/refer-upstream'
blob
|
commitdiff
|
raw
2010-01-23
Junio C Hamano
Merge branch 'jl/submodule-diff'
blob
|
commitdiff
|
raw
2010-01-23
Junio C Hamano
Merge branch 'il/remote-updates'
blob
|
commitdiff
|
raw
2010-01-23
Junio C Hamano
Merge branch 'il/branch-set-upstream'
blob
|
commitdiff
|
raw
2010-01-23
Junio C Hamano
Merge branch 'jc/maint-limit-note-output'
blob
|
commitdiff
|
raw
2010-01-23
Junio C Hamano
Merge branch 'nd/ls-files-sparse-fix'
blob
|
commitdiff
|
raw
2010-01-22
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2010-01-21
Junio C Hamano
Merge branch 'bw/cvsimport'
blob
|
commitdiff
|
raw
2010-01-21
Junio C Hamano
Merge branch 'jc/checkout-merge-base'
blob
|
commitdiff
|
raw
2010-01-21
Junio C Hamano
Merge branch 'ag/patch-header-verify'
blob
|
commitdiff
|
raw
2010-01-21
Junio C Hamano
Merge branch 'jc/conflict-marker-size'
blob
|
commitdiff
|
raw
2010-01-21
Junio C Hamano
Merge branch 'ag/maint-apply-too-large-p'
blob
|
commitdiff
|
raw
|
diff to current
2010-01-21
Junio C Hamano
Merge branch 'ap/merge-backend-opts'
blob
|
commitdiff
|
raw
|
diff to current
2010-01-18
Avery Pennarun
git merge -X<option>
blob
|
commitdiff
|
raw
|
diff to current
2010-01-17
Junio C Hamano
rerere: honor conflict-marker-size attribute
blob
|
commitdiff
|
raw
|
diff to current
2009-12-27
Junio C Hamano
Merge branch 'nf/maint-fix-index-ext-len-on-be64' into...
blob
|
commitdiff
|
raw
|
diff to current
2009-12-09
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2009-12-09
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2009-10-27
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2009-09-21
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2009-08-16
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2009-06-20
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2009-06-11
Junio C Hamano
Merge branch 'uk/maint-1.5.3-rebase-i-reflog' into...
blob
|
commitdiff
|
raw
|
diff to current
2009-05-02
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2009-05-01
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2009-03-02
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2009-02-11
Junio C Hamano
Merge branch 'maint-1.5.4' into maint-1.5.5
blob
|
commitdiff
|
raw
|
diff to current
2008-12-22
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2008-12-18
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2008-12-17
Junio C Hamano
GIT 1.5.5.6
v1.5.5.6
blob
|
commitdiff
|
raw
|
diff to current
2008-12-02
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2008-12-02
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2008-12-01
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2008-12-01
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2008-11-16
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2008-11-13
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2008-11-13
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2008-11-02
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
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-21
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
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-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
2008-08-06
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2008-07-30
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2008-07-27
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2008-07-15
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2008-07-06
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2008-06-27
Junio C Hamano
Merge branch 'maint-1.5.4' into maint-1.5.5
blob
|
commitdiff
|
raw
|
diff to current
2008-06-11
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2008-05-27
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2008-05-26
Junio C Hamano
Merge branch 'maint-1.5.4' into maint
blob
|
commitdiff
|
raw
|
diff to current
2008-05-24
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2008-05-23
Junio C Hamano
Merge branch 'maint-1.5.4' into maint
v1.5.5.2
blob
|
commitdiff
|
raw
|
diff to current
2008-05-21
Junio C Hamano
Merge branch 'maint-1.5.4' into maint
blob
|
commitdiff
|
raw
|
diff to current
2008-05-15
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2008-05-15
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2008-05-14
Junio C Hamano
Merge branch 'maint-1.5.4' into maint
blob
|
commitdiff
|
raw
|
diff to current
2008-05-11
Junio C Hamano
Merge branch 'maint-1.5.4' into maint
blob
|
commitdiff
|
raw
|
diff to current
2008-05-09
Junio C Hamano
Merge branch 'maint-1.5.4' into maint
blob
|
commitdiff
|
raw
|
diff to current
2008-05-04
Junio C Hamano
Merge branch 'maint-1.5.4' into maint
blob
|
commitdiff
|
raw
|
diff to current
2008-04-30
Junio C Hamano
Merge branch 'maint-1.5.4' into maint
blob
|
commitdiff
|
raw
|
diff to current
2008-04-28
Junio C Hamano
Merge branch 'maint-1.5.4' into maint
blob
|
commitdiff
|
raw
|
diff to current
2008-04-25
Junio C Hamano
Merge branch 'maint-1.5.4' into maint
blob
|
commitdiff
|
raw
|
diff to current
2008-04-23
Junio C Hamano
Merge branch 'maint-1.5.4' into maint
blob
|
commitdiff
|
raw
|
diff to current
2008-04-19
Junio C Hamano
Merge branch 'maint-1.5.4' into maint
blob
|
commitdiff
|
raw
|
diff to current
2008-04-17
Junio C Hamano
Merge branch 'maint-1.5.4' into maint
blob
|
commitdiff
|
raw
|
diff to current
2008-04-16
Junio C Hamano
Merge branch 'maint-1.5.4' into maint
blob
|
commitdiff
|
raw
|
diff to current
2008-04-12
Junio C Hamano
Merge branch 'maint-1.5.4' into maint
blob
|
commitdiff
|
raw
|
diff to current
2008-04-12
Junio C Hamano
Merge branch 'maint-1.5.4' into maint
blob
|
commitdiff
|
raw
|
diff to current
2008-04-10
Junio C Hamano
Merge branch 'maint-1.5.4' into maint
blob
|
commitdiff
|
raw
|
diff to current
2008-04-09
Junio C Hamano
Merge branch 'jc/rename'
blob
|
commitdiff
|
raw
|
diff to current
2008-04-09
Junio C Hamano
Merge branch 'mk/unpack-careful'
blob
|
commitdiff
|
raw
|
diff to current
next
![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
