Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅
next
commit
grep
author
committer
pickaxe
?
re
rebase: Support preserving merges in non-interactive mode
[gitweb.git]
/
merge-index.c
2008-09-29
Merge branch 'jc/better-conflict-resolution'
blob
|
diff
|
raw
2008-09-25
Merge branch 'mv/merge-recursive'
blob
|
diff
|
raw
2008-09-25
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
2008-09-19
Merge branch 'jc/diff-prefix'
blob
|
diff
|
raw
2008-09-19
Merge branch 'np/pack'
blob
|
diff
|
raw
2008-09-19
Merge branch 'tr/rev-list-reverse'
blob
|
diff
|
raw
2008-09-19
Merge branch 'cc/bisect'
blob
|
diff
|
raw
2008-09-19
Merge branch 'jc/maint-name-hash-clear' into maint
blob
|
diff
|
raw
2008-09-16
Merge branch 'jc/maint-name-hash-clear'
blob
|
diff
|
raw
2008-09-10
Merge branch 'jc/maint-hide-cr-in-diff-from-less' into...
blob
|
diff
|
raw
2008-09-10
Merge branch 'jc/maint-checkout-fix' into maint
blob
|
diff
|
raw
2008-09-10
Merge branch 'np/maint-safer-pack' into maint
blob
|
diff
|
raw
2008-09-08
Merge branch 'ar/autospell'
blob
|
diff
|
raw
2008-09-08
Merge branch 'jc/cc-ld-dynpath'
blob
|
diff
|
raw
2008-09-08
Merge branch 'jc/hide-cr-in-diff-from-less'
blob
|
diff
|
raw
2008-09-08
Merge branch 'jc/maint-checkout-fix'
blob
|
diff
|
raw
2008-09-07
Merge updated git-gui and gitk that call each other
blob
|
diff
|
raw
2008-09-06
Merge branch 'maint' of git://repo.or.cz/git-gui into...
blob
|
diff
|
raw
2008-09-03
Merge branch 'maint'
blob
|
diff
|
raw
2008-09-03
Merge branch 'nd/worktree' into maint
blob
|
diff
|
raw
2008-09-03
Merge branch 'ho/dashless' into maint
blob
|
diff
|
raw
2008-08-31
'git foo' program identifies itself without dash in...
blob
|
diff
|
raw
2008-08-17
Merge git-gui 0.11.0
blob
|
diff
|
raw
|
diff to current
2008-08-17
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
|
diff to current
2008-08-06
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2008-08-06
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
|
diff to current
2008-07-30
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2008-07-27
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2008-07-15
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2008-07-06
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2008-06-27
Merge branch 'maint-1.5.4' into maint-1.5.5
blob
|
diff
|
raw
|
diff to current
2008-06-11
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
|
diff to current
2008-05-27
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2008-05-26
Merge branch 'maint-1.5.4' into maint
blob
|
diff
|
raw
|
diff to current
2008-05-24
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
|
diff to current
2008-05-23
Merge branch 'maint-1.5.4' into maint
v1.5.5.2
blob
|
diff
|
raw
|
diff to current
2008-05-21
Merge branch 'maint-1.5.4' into maint
blob
|
diff
|
raw
|
diff to current
2008-05-15
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2008-05-15
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
|
diff to current
2008-05-14
Merge branch 'maint-1.5.4' into maint
blob
|
diff
|
raw
|
diff to current
2008-05-11
Merge branch 'maint-1.5.4' into maint
blob
|
diff
|
raw
|
diff to current
2008-05-09
Merge branch 'maint-1.5.4' into maint
blob
|
diff
|
raw
|
diff to current
2008-05-04
Merge branch 'maint-1.5.4' into maint
blob
|
diff
|
raw
|
diff to current
2008-04-30
Merge branch 'maint-1.5.4' into maint
blob
|
diff
|
raw
|
diff to current
2008-04-28
Merge branch 'maint-1.5.4' into maint
blob
|
diff
|
raw
|
diff to current
2008-04-25
Merge branch 'maint-1.5.4' into maint
blob
|
diff
|
raw
|
diff to current
2008-04-23
Merge branch 'maint-1.5.4' into maint
blob
|
diff
|
raw
|
diff to current
2008-04-19
Merge branch 'maint-1.5.4' into maint
blob
|
diff
|
raw
|
diff to current
2008-04-17
Merge branch 'maint-1.5.4' into maint
blob
|
diff
|
raw
|
diff to current
2008-04-16
Merge branch 'maint-1.5.4' into maint
blob
|
diff
|
raw
|
diff to current
2008-04-12
Merge branch 'maint-1.5.4' into maint
blob
|
diff
|
raw
|
diff to current
2008-04-12
Merge branch 'maint-1.5.4' into maint
blob
|
diff
|
raw
|
diff to current
2008-04-10
Merge branch 'maint-1.5.4' into maint
blob
|
diff
|
raw
|
diff to current
2008-04-09
Merge branch 'jc/rename'
blob
|
diff
|
raw
|
diff to current
2008-04-08
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
|
diff to current
2008-04-07
Merge branch 'jc/maint-apply-match-beginning'
blob
|
diff
|
raw
|
diff to current
2008-04-05
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2008-04-02
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2008-03-28
GIT 1.5.5-rc2
v1.5.5-rc2
blob
|
diff
|
raw
|
diff to current
2008-03-27
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2008-03-26
Merge branch 'jc/maint-fetch-regression-1.5.4'
blob
|
diff
|
raw
|
diff to current
2008-03-16
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2008-03-16
Merge branch 'master' of git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2008-03-15
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2008-03-15
Merge branch 'maint'
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-14
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2008-03-13
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2008-03-12
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2008-03-12
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2008-03-11
Merge branch 'jc/cherry-pick' (early part)
blob
|
diff
|
raw
|
diff to current
2008-03-11
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2008-03-09
Merge branch 'kb/maint-filter-branch-disappear'
blob
|
diff
|
raw
|
diff to current
2008-03-09
Merge branch 'maint' to sync with 1.5.4.4
blob
|
diff
|
raw
|
diff to current
2008-03-08
Merge branch 'aw/maint-shortlog-blank-lines'
blob
|
diff
|
raw
|
diff to current
2008-03-08
Merge branch 'maint'
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-04
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2008-03-03
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2008-03-02
Merge branch 'pb/cvsimport'
blob
|
diff
|
raw
|
diff to current
2008-03-02
Merge branch 'jc/maint-log-merge-left-right'
blob
|
diff
|
raw
|
diff to current
2008-03-02
Merge branch 'mh/maint-http-proxy-fix'
blob
|
diff
|
raw
|
diff to current
2008-03-02
Merge branch 'mk/maint-parse-careful'
blob
|
diff
|
raw
|
diff to current
2008-03-02
Merge branch 'ew/maint-svn-cert-fileprovider'
blob
|
diff
|
raw
|
diff to current
2008-03-02
Merge branch 'js/maint-daemon'
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'
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-29
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2008-02-27
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2008-02-27
Merge branch 'js/branch-track'
blob
|
diff
|
raw
|
diff to current
2008-02-27
Merge branch 'db/checkout'
blob
|
diff
|
raw
|
diff to current
2008-02-27
Merge branch 'db/cover-letter'
blob
|
diff
|
raw
|
diff to current
2008-02-27
Merge branch 'js/merge'
blob
|
diff
|
raw
|
diff to current
2008-02-27
Merge branch 'jc/diff-relative'
blob
|
diff
|
raw
|
diff to current
2008-02-27
Merge branch 'db/push-single-with-HEAD'
blob
|
diff
|
raw
|
diff to current
2008-02-27
Merge branch 'db/host-alias'
blob
|
diff
|
raw
|
diff to current
2008-02-26
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2008-02-25
Merge branch 'lt/dirstat'
blob
|
diff
|
raw
|
diff to current
2008-02-25
Merge branch 'jc/apply-whitespace'
blob
|
diff
|
raw
|
diff to current
next