projects
/
git.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
git-tar-tree: no more void pointer arithmetic
[git.git]
/ git-merge.sh
2006-06-18
Junio C Hamano
Merge branch 'jc/rw-prefix'
commit
|
commitdiff
2006-06-13
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
commit
|
commitdiff
2006-06-10
Junio C Hamano
Merge git://git.kernel.org/pub/scm/git/gitweb
commit
|
commitdiff
2006-06-07
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
commit
|
commitdiff
2006-06-01
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
commit
|
commitdiff
2006-05-29
Junio C Hamano
Merge branch 'jc/dirwalk-n-cache-tree' into jc/cache...
commit
|
commitdiff
2006-05-21
Junio C Hamano
Merge branch 'master' into js/fmt-patch
commit
|
commitdiff
2006-05-20
Junio C Hamano
Merge branch 'jc/cache-tree' into jc/dirwalk-n-cache...
commit
|
commitdiff
2006-05-20
Junio C Hamano
Merge branch 'js/fetchconfig'
commit
|
commitdiff
2006-05-19
Junio C Hamano
Merge branch 'jc/apply'
commit
|
commitdiff
2006-05-19
Junio C Hamano
Merge part of 'js/fmt-patch' for RFC2822 dates into...
commit
|
commitdiff
2006-05-18
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
2006-05-17
Junio C Hamano
Merge branch 'jc/apply'
commit
|
commitdiff
2006-05-17
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
2006-05-17
Junio C Hamano
Merge branch 'np/pack'
commit
|
commitdiff
2006-05-16
Junio C Hamano
Merge branch 'se/tag'
commit
|
commitdiff
2006-05-16
Junio C Hamano
Merge branch 'se/rev-parse'
commit
|
commitdiff
2006-05-16
Junio C Hamano
Merge branch 'se/diff'
commit
|
commitdiff
2006-05-14
Sean
Convert some "apply --summary" users to "diff --summary".
commit
|
commitdiff
2006-05-03
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
commit
|
commitdiff
2006-04-24
Junio C Hamano
Merge branch 'sh/daemon'
commit
|
commitdiff
2006-04-24
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
commit
|
commitdiff
2006-04-21
Junio C Hamano
Merge branch 'master' into jc/fmt-patch
commit
|
commitdiff
2006-04-19
Junio C Hamano
Merge branch 'lt/xsha1'
commit
|
commitdiff
2006-04-19
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
2006-04-19
Junio C Hamano
git-merge: a bit more readable user guidance.
commit
|
commitdiff
2006-04-17
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
commit
|
commitdiff
2006-04-07
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
commit
|
commitdiff
2006-04-07
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
2006-04-05
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
commit
|
commitdiff
2006-04-05
Junio C Hamano
Merge branch 'fix'
commit
|
commitdiff
2006-04-04
Junio C Hamano
Merge branch 'lt/fix-sol-pack'
commit
|
commitdiff
2006-04-04
Junio C Hamano
Merge branch 'lt/fix-sol-pack' into next
commit
|
commitdiff
2006-04-02
Junio C Hamano
Merge branch 'lt/fix-sol-pack' into next
commit
|
commitdiff
2006-03-31
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
commit
|
commitdiff
2006-03-28
Junio C Hamano
Merge branch ak/svn
commit
|
commitdiff
2006-03-27
Junio C Hamano
Merge branch 'lt/diffgen' into next
commit
|
commitdiff
2006-03-26
Junio C Hamano
Merge branches 'jc/clone' and 'jc/name'
commit
|
commitdiff
2006-03-26
Junio C Hamano
Merge branch 'jc/merge'
commit
|
commitdiff
2006-03-26
Junio C Hamano
Merge branch 'lt/diffgen' into next
commit
|
commitdiff
2006-03-26
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
commit
|
commitdiff
2006-03-26
Junio C Hamano
Merge branch 'ew/email' into next
commit
|
commitdiff
2006-03-26
Junio C Hamano
Merge branch 'lt/diffgen' into next
commit
|
commitdiff
2006-03-26
Junio C Hamano
Merge branch 'rs/tar-tree' into next
commit
|
commitdiff
2006-03-24
Junio C Hamano
Merge branch 'jc/name' into next
commit
|
commitdiff
2006-03-22
Junio C Hamano
Merge branch 'jc/pull' into next
commit
|
commitdiff
2006-03-22
Junio C Hamano
Merge branch 'jc/revlist' into next
commit
|
commitdiff
2006-03-22
Junio C Hamano
Merge branch 'jc/clone' into next
commit
|
commitdiff
2006-03-21
Junio C Hamano
Merge branch 'jc/clone' into next
commit
|
commitdiff
2006-03-21
Junio C Hamano
Merge branch 'jc/name' into next
commit
|
commitdiff
2006-03-21
Junio C Hamano
Merge branch 'jc/name' into next
commit
|
commitdiff
2006-03-21
Junio C Hamano
Merge branch 'jc/clone' into next
commit
|
commitdiff
2006-03-20
Junio C Hamano
Merge branch 'jc/merge' into next
commit
|
commitdiff
2006-03-20
Junio C Hamano
git-merge knows some strategies want to skip trivial...
commit
|
commitdiff
2006-03-15
Junio C Hamano
Merge branch 'lt/diff' into next
commit
|
commitdiff
2006-03-15
Junio C Hamano
Merge branch 'lt/diff' into next
commit
|
commitdiff
2006-03-13
Junio C Hamano
Merge branch 'jc/pack'
commit
|
commitdiff
2006-03-13
Junio C Hamano
Merge branch 'jc/fsck'
commit
|
commitdiff
2006-03-13
Junio C Hamano
Merge branch 'jc/diff' into next
commit
|
commitdiff
2006-03-13
Junio C Hamano
Merge branch 'jc/diff' into next
commit
|
commitdiff
2006-03-13
Junio C Hamano
Merge branch 'jc/diff' into next
commit
|
commitdiff
2006-03-12
Junio C Hamano
Merge branch 'jc/diff' into next
commit
|
commitdiff
2006-03-11
Junio C Hamano
Merge branch 'fk/blame' into next
commit
|
commitdiff
2006-03-10
Olaf Hering
allow double click on current HEAD id after git-pull
commit
|
commitdiff
2006-03-04
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
2006-03-02
Junio C Hamano
Merge part of 'lt/rev-list' into 'fk/blame'
commit
|
commitdiff
2006-03-02
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
2006-03-02
Junio C Hamano
Merge branch 'jc/tag'
commit
|
commitdiff
2006-03-02
Junio C Hamano
Merge branch 'jc/tag' into next
commit
|
commitdiff
2006-03-02
Junio C Hamano
Up to date with GIT 1.2.4 fixes
commit
|
commitdiff
2006-03-02
Junio C Hamano
Merge early parts of 'np/delta' branch
commit
|
commitdiff
2006-03-01
Junio C Hamano
Merge git-mv fixes from 'maint'
commit
|
commitdiff
2006-02-28
Junio C Hamano
Merge part of np/delta
commit
|
commitdiff
2006-02-26
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
2006-02-25
Junio C Hamano
Merge branches 'jc/rev-list' and 'jc/pack-thin'
commit
|
commitdiff
2006-02-25
Junio C Hamano
Merge branches 'jc/rev-list' and 'jc/pack-thin'
commit
|
commitdiff
2006-02-24
Junio C Hamano
Merge fixes early for next maint series.
commit
|
commitdiff
2006-02-24
Junio C Hamano
Merge branch 'fix' into maint
commit
|
commitdiff
2006-02-24
Junio C Hamano
Merge branches 'jc/rev-list' and 'jc/pack-thin' into...
commit
|
commitdiff
2006-02-24
Junio C Hamano
Merge fix bits from jc/rev-list
commit
|
commitdiff
2006-02-24
Junio C Hamano
Merge branch 'np/delta' into next
commit
|
commitdiff
2006-02-24
Junio C Hamano
Merge branch 'ar/win'
commit
|
commitdiff
2006-02-24
Junio C Hamano
Merge branch 'jc/send-insane-refs'
commit
|
commitdiff
2006-02-24
Junio C Hamano
Merge fixes early for next maint series.
commit
|
commitdiff
2006-02-24
Junio C Hamano
Merge branches 'jc/fix-co-candy', 'jc/fix-rename-leak...
commit
|
commitdiff
2006-02-23
Junio C Hamano
Merge part of pack-thin branch
commit
|
commitdiff
2006-02-23
Junio C Hamano
Merge branch 'np/delta' into next
commit
|
commitdiff
2006-02-23
Junio C Hamano
Merge branches 'maint', 'jc/fix-co-candy' and 'jc/fix...
commit
|
commitdiff
2006-02-23
Junio C Hamano
Merge branch 'ra/anno'
commit
|
commitdiff
2006-02-23
Junio C Hamano
checkout - eye candy.
commit
|
commitdiff
2006-02-23
Junio C Hamano
Merge fixes up to GIT 1.2.3
commit
|
commitdiff
2006-02-22
Junio C Hamano
Keep Porcelainish from failing by broken ident after...
commit
|
commitdiff
2006-02-22
Junio C Hamano
Merge branch 'ra/anno' into next
commit
|
commitdiff
2006-02-22
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
commit
|
commitdiff
2006-02-22
Junio C Hamano
Merge branch 'fix'
commit
|
commitdiff
2006-02-22
Junio C Hamano
Merge branch 'jc/perl'
commit
|
commitdiff
2006-02-22
Junio C Hamano
Merge branch 'jc/pack-reuse'
commit
|
commitdiff
2006-02-22
Junio C Hamano
Merge branch 'jc/nostat'
commit
|
commitdiff
2006-02-22
Junio C Hamano
Merge branch 'js/portable'
commit
|
commitdiff
2006-02-21
Junio C Hamano
Merge part of jc/portable branch
commit
|
commitdiff
next