Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first
⋅
prev
⋅
next
commit
grep
author
committer
pickaxe
?
re
Merge branch 'rc/maint-http-local-slot-fix'
[gitweb.git]
/
Documentation
/
merge-strategies.txt
2008-05-23
Merge branch 'maint-1.5.4' into maint
v1.5.5.2
blob
|
diff
|
raw
2008-05-21
Merge branch 'maint-1.5.4' into maint
blob
|
diff
|
raw
2008-05-15
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
2008-05-15
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
2008-05-14
Merge branch 'maint-1.5.4' into maint
blob
|
diff
|
raw
2008-05-11
Merge branch 'maint-1.5.4' into maint
blob
|
diff
|
raw
2008-05-09
Merge branch 'maint-1.5.4' into maint
blob
|
diff
|
raw
2008-05-04
Merge branch 'maint-1.5.4' into maint
blob
|
diff
|
raw
2008-04-30
Merge branch 'maint-1.5.4' into maint
blob
|
diff
|
raw
2008-04-28
Merge branch 'maint-1.5.4' into maint
blob
|
diff
|
raw
2008-04-25
Merge branch 'maint-1.5.4' into maint
blob
|
diff
|
raw
2008-04-23
Merge branch 'maint-1.5.4' into maint
blob
|
diff
|
raw
2008-04-19
Merge branch 'maint-1.5.4' into maint
blob
|
diff
|
raw
2008-04-17
Merge branch 'maint-1.5.4' into maint
blob
|
diff
|
raw
2008-04-16
Merge branch 'maint-1.5.4' into maint
blob
|
diff
|
raw
2008-04-12
Merge branch 'maint-1.5.4' into maint
blob
|
diff
|
raw
2008-04-12
Merge branch 'maint-1.5.4' into maint
blob
|
diff
|
raw
2008-04-10
Merge branch 'maint-1.5.4' into maint
blob
|
diff
|
raw
2008-04-09
Merge branch 'jc/rename'
blob
|
diff
|
raw
2008-04-09
Merge branch 'mk/unpack-careful'
blob
|
diff
|
raw
2008-04-09
Merge branch 'fl/send-email-outside'
blob
|
diff
|
raw
2008-04-09
Merge branch 'jc/rebase'
blob
|
diff
|
raw
2008-04-08
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
2008-04-07
Merge branch 'jc/maint-apply-match-beginning'
blob
|
diff
|
raw
2008-04-05
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
2008-04-02
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
2008-03-28
GIT 1.5.5-rc2
v1.5.5-rc2
blob
|
diff
|
raw
2008-03-27
Merge branch 'maint'
blob
|
diff
|
raw
2008-03-26
Merge branch 'jc/maint-fetch-regression-1.5.4'
blob
|
diff
|
raw
2008-03-23
Merge branch 'git-p4' of git://repo.or.cz/git/git-p4
blob
|
diff
|
raw
2008-03-19
Documentation/git-merge: document subtree strategy.
blob
|
diff
|
raw
2008-03-16
Merge branch 'master' of git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2008-03-15
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
|
diff to current
2008-03-12
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2008-03-06
Merge branch 'maint' of git://repo.or.cz/git-gui into...
blob
|
diff
|
raw
|
diff to current
2008-03-01
Merge branch 'master' of git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2008-03-01
Merge branch 'maint' of git://repo.or.cz/git-gui into...
blob
|
diff
|
raw
|
diff to current
2008-02-23
Merge branch 'maint' of git://repo.or.cz/git-gui into...
blob
|
diff
|
raw
|
diff to current
2008-02-17
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2008-02-17
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
|
diff to current
2008-02-13
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2008-02-13
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
|
diff to current
2008-01-24
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2008-01-21
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2008-01-21
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2008-01-21
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
|
diff to current
2008-01-11
Merge ../gitk
blob
|
diff
|
raw
|
diff to current
2008-01-09
Merge branch 'master' of git://git./gitk/gitk
blob
|
diff
|
raw
|
diff to current
2008-01-05
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2007-12-07
Merge branch 'master' of git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2007-11-21
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2007-10-28
Merge branch 'master' of git://git./gitk/gitk
blob
|
diff
|
raw
|
diff to current
2007-10-21
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
|
diff to current
2007-10-21
Merge branch 'maint' of git://repo.or.cz/git-gui into...
blob
|
diff
|
raw
|
diff to current
2007-09-18
Merge branch 'maint' of git://repo.or.cz/git-gui into...
blob
|
diff
|
raw
|
diff to current
2007-08-29
Merge branch 'master' of git://git./gitk/gitk
blob
|
diff
|
raw
|
diff to current
2007-08-27
Merge branch 'master' of git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2007-08-21
Merge branch 'master' of git://git./gitk/gitk
blob
|
diff
|
raw
|
diff to current
2007-08-19
Merge branch 'master' of git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2007-08-19
Merge branch 'master' of git://git./gitk/gitk
blob
|
diff
|
raw
|
diff to current
2007-08-13
Merge branch 'master' of git://git./gitk/gitk
blob
|
diff
|
raw
|
diff to current
2007-07-30
Merge branch 'master' of git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2007-07-28
Merge branch 'master' of git://git./gitk/gitk
blob
|
diff
|
raw
|
diff to current
2007-07-14
Merge branch 'master' of git://git./gitk/gitk
blob
|
diff
|
raw
|
diff to current
2007-07-12
Merge branch 'master' of git://git./gitk/gitk
blob
|
diff
|
raw
|
diff to current
2007-07-12
Merge commit 'git-gui/master'
blob
|
diff
|
raw
|
diff to current
2007-07-12
Merge branch 'maint' of git://repo.or.cz/git-gui into...
blob
|
diff
|
raw
|
diff to current
2007-06-29
Merge branch 'master' of git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2007-06-29
Merge branch 'maint' of git://repo.or.cz/git-gui into...
blob
|
diff
|
raw
|
diff to current
2007-06-28
Merge branch 'master' of git://git./gitk/gitk
blob
|
diff
|
raw
|
diff to current
2007-06-26
Merge branch 'master' of git://git./gitk/gitk into...
blob
|
diff
|
raw
|
diff to current
2007-06-22
Import branch 'git-p4' of git://repo.or.cz/fast-export
blob
|
diff
|
raw
|
diff to current
2007-06-12
Merge branch 'master' of git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2007-06-12
Merge branch 'maint' of git://repo.or.cz/git-gui into...
blob
|
diff
|
raw
|
diff to current
2007-06-11
Merge branch 'master' of git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2007-06-11
Merge branch 'maint' of git://repo.or.cz/git-gui into...
blob
|
diff
|
raw
|
diff to current
2007-05-29
Merge branch 'maint' of git://repo.or.cz/git-gui into...
blob
|
diff
|
raw
|
diff to current
2007-05-17
Merge branch 'master' of git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2007-05-10
Merge branch 'master' of git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2007-05-08
Merge branch 'master' of git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2007-05-07
Merge branch 'master' of git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2007-05-07
Merge branch 'maint' of git://repo.or.cz/git-gui into...
blob
|
diff
|
raw
|
diff to current
2007-05-07
Merge git://git2./pub/scm/gitk/gitk into maint
blob
|
diff
|
raw
|
diff to current
2007-04-18
Merge branch 'master' of git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2007-04-18
Merge branch 'maint' of git://repo.or.cz/git-gui into...
blob
|
diff
|
raw
|
diff to current
2007-04-15
Merge git://git2./pub/scm/gitk/gitk into maint
blob
|
diff
|
raw
|
diff to current
2007-03-22
Merge git://git2.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
|
diff to current
2007-03-20
Merge git://git2.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
|
diff to current
2007-03-13
Merge branch 'master' of git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2007-03-12
Merge branch 'maint' of git://repo.or.cz/git-gui into...
blob
|
diff
|
raw
|
diff to current
2007-03-06
Merge branch 'master' of git://repo.or.cz/git-gui into...
blob
|
diff
|
raw
|
diff to current
2007-02-25
Merge git://repo.or.cz/git-gui into maint
blob
|
diff
|
raw
|
diff to current
2007-02-21
Merge branch 'master' of git://repo.or.cz/git-gui into...
blob
|
diff
|
raw
|
diff to current
2007-02-18
Merge git://git./pub/scm/gitk/gitk into maint
blob
|
diff
|
raw
|
diff to current
2007-02-13
Merge branch 'master' of git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2007-02-13
Merge branch 'master' of git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2007-02-12
Merge git-gui
blob
|
diff
|
raw
|
diff to current
2007-01-15
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
|
diff to current
2006-11-29
Merge master.kernel.org:/pub/scm/gitk/gitk
blob
|
diff
|
raw
|
diff to current
2006-11-08
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
|
diff to current
next