Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅
next
commit
grep
author
committer
pickaxe
?
re
merge-recursive: separate out xdl_merge() interface.
[gitweb.git]
/
builtin-fmt-merge-msg.c
2007-04-04
Merge 1.5.0.7 in
blob
|
diff
|
raw
2007-03-30
Merge branch 'maint'
blob
|
diff
|
raw
2007-03-28
Merge branch 'maint' to synchronize with 1.5.0.6
blob
|
diff
|
raw
2007-03-25
Merge branch 'maint'
blob
|
diff
|
raw
2007-03-25
Merge branch 'maint'
blob
|
diff
|
raw
2007-03-24
Merge branch 'maint'
blob
|
diff
|
raw
2007-03-22
Merge git://git2.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
2007-03-22
Merge branch 'maint'
blob
|
diff
|
raw
2007-03-20
Merge git://git2.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
2007-03-18
Merge 1.5.0.5 in from 'maint'
blob
|
diff
|
raw
2007-03-17
Merge branch 'maint'
blob
|
diff
|
raw
2007-03-14
Merge GIT 1.5.0.4
blob
|
diff
|
raw
2007-03-14
Merge branch 'jc/fetch'
blob
|
diff
|
raw
2007-03-14
Merge branch 'maint'
blob
|
diff
|
raw
2007-03-13
Merge branch 'master' of git://repo.or.cz/git-gui
blob
|
diff
|
raw
2007-03-13
Merge branch 'maint'
blob
|
diff
|
raw
2007-03-12
Merge branch 'maint'
blob
|
diff
|
raw
2007-03-12
Merge branch 'maint' of git://repo.or.cz/git-gui into...
blob
|
diff
|
raw
|
diff to current
2007-03-12
Merge branch 'maint'
blob
|
diff
|
raw
2007-03-11
Merge branch 'maint'
blob
|
diff
|
raw
2007-03-07
Merge branch 'maint'
blob
|
diff
|
raw
2007-03-06
Merge branch 'maint'
blob
|
diff
|
raw
2007-03-06
Merge branch 'master' of git://repo.or.cz/git-gui into...
blob
|
diff
|
raw
|
diff to current
2007-03-06
Merge branch 'maint'
blob
|
diff
|
raw
2007-03-06
Merge branch 'master-for-junio' of git://repo.or.cz...
blob
|
diff
|
raw
2007-03-05
Merge branch 'maint'
blob
|
diff
|
raw
2007-03-05
Merge branch 'js/fetch-progress' (early part)
blob
|
diff
|
raw
2007-03-05
Merge branch 'maint'
blob
|
diff
|
raw
2007-03-04
Merge branch 'maint'
blob
|
diff
|
raw
2007-03-03
Merge branch 'maint'
blob
|
diff
|
raw
2007-03-02
Merge branch 'js/commit-format'
blob
|
diff
|
raw
2007-03-02
Merge branch 'maint'
blob
|
diff
|
raw
2007-02-28
Merge branch 'js/commit-by-name'
blob
|
diff
|
raw
2007-02-28
Merge branch 'js/bundle'
blob
|
diff
|
raw
2007-02-28
Merge branch 'maint'
blob
|
diff
|
raw
2007-02-28
Merge branch 'np/types'
blob
|
diff
|
raw
2007-02-28
Merge branch 'mc/sendmail'
blob
|
diff
|
raw
2007-02-28
Merge branch 'js/diff-ni' (early part)
blob
|
diff
|
raw
2007-02-28
Merge branch 'maint'
blob
|
diff
|
raw
2007-02-28
builtin-fmt-merge-msg: fix bugs in --file option
blob
|
diff
|
raw
|
diff to current
2007-02-27
Merge branch 'np/types' into jc/fetch
blob
|
diff
|
raw
|
diff to current
2007-02-27
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2007-02-26
Merge branch 'master' into js/diff-ni
blob
|
diff
|
raw
|
diff to current
2007-02-26
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2007-02-26
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2007-02-25
Merge branch 'maint'
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-24
Merge branch 'js/apply'
blob
|
diff
|
raw
|
diff to current
2007-02-24
Merge branch 'js/no-limit-boundary'
blob
|
diff
|
raw
|
diff to current
2007-02-24
Merge branch 'js/etc-config'
blob
|
diff
|
raw
|
diff to current
2007-02-24
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2007-02-23
Merge branches 'lt/crlf' and 'jc/apply-config'
blob
|
diff
|
raw
|
diff to current
2007-02-23
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2007-02-21
Merge branch '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-21
Merge branch 'fk/autoconf'
blob
|
diff
|
raw
|
diff to current
2007-02-21
Merge branch 'js/name-rev-fix'
blob
|
diff
|
raw
|
diff to current
2007-02-21
Mechanical conversion to use prefixcmp()
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
2007-01-14
Merge branch 'master' into sp/fast-import
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-24
Merge branch 'jc/numstat'
blob
|
diff
|
raw
|
diff to current
2006-11-24
Merge branch 'jc/upload-pack'
blob
|
diff
|
raw
|
diff to current
2006-11-17
"git fmt-merge-msg" SIGSEGV
blob
|
diff
|
raw
|
diff to current
2006-11-13
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2006-11-12
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2006-11-11
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2006-11-09
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2006-11-09
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2006-11-08
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
|
diff to current
2006-11-08
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2006-11-08
Merge branch 'jc/pickaxe'
blob
|
diff
|
raw
|
diff to current
2006-11-07
Merge branch 'jc/read-tree'
blob
|
diff
|
raw
|
diff to current
2006-11-07
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2006-11-05
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2006-11-05
Merge branch 'lt/push-config'
blob
|
diff
|
raw
|
diff to current
2006-11-05
Merge branch 'pb/web'
blob
|
diff
|
raw
|
diff to current
2006-11-04
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2006-11-03
Merge branch 'master' into np/index-pack
blob
|
diff
|
raw
|
diff to current
2006-11-03
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2006-11-01
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2006-11-01
Merge branch 'rs/cherry'
blob
|
diff
|
raw
|
diff to current
2006-11-01
Merge branch 'lj/refs'
blob
|
diff
|
raw
|
diff to current
2006-10-17
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2006-10-02
Merge branch 'master' into lj/refs
blob
|
diff
|
raw
|
diff to current
2006-10-02
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2006-10-01
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2006-10-01
Merge branch 'sb/fetch' into jc/refs-and-fetch
blob
|
diff
|
raw
|
diff to current
2006-10-01
Merge branch 'jc/gitpm'
blob
|
diff
|
raw
|
diff to current
2006-09-28
Merge branch 'master' into lj/refs
blob
|
diff
|
raw
|
diff to current
2006-09-28
Merge branch 'jc/for-each-ref' into jc/ref-locking
blob
|
diff
|
raw
|
diff to current
2006-09-21
Merge branch 'lt/refs' into jc/lt-ref2-with-lt-refs
blob
|
diff
|
raw
|
diff to current
2006-09-21
Merge branch 'lt/refs' into jc/for-each-ref-with-lt...
blob
|
diff
|
raw
|
diff to current
2006-09-21
Tell between packed, unpacked and symbolic refs.
blob
|
diff
|
raw
|
diff to current
2006-09-18
Make ref resolution saner
blob
|
diff
|
raw
|
diff to current
2006-09-18
Merge part of branch 'jc/upload-pack'
blob
|
diff
|
raw
|
diff to current
next