Merge branch 'jc/read-tree'
[gitweb.git] / git-merge.sh
2006-07-25 Merge branch 'jc/read-tree'
2006-07-25 Merge branch 'lt/objformat'
2006-07-17 Merge branch 'sp/reflog' v1.4.2-rc1
2006-07-11 Log ref changes made by git-merge and git-pull.
2006-07-05 Merge branch 'jc/sha1'
2006-07-05 Merge branch 'jc/diff-test'
2006-07-05 Merge branch 'th/diff'
2006-06-29 Merge branch 'jc/repack'
2006-06-29 Merge branch 'js/patch'
2006-06-27 Fix expr usage for FreeBSD
2006-06-26 Merge branch 'jc/squash'
2006-06-26 Merge branch 'js/diff'
2006-06-24 git-merge --squash
2006-06-24 Merge branch 'pb/error'
2006-06-24 git-merge: Don't use -p when outputting summary
2006-06-18 Merge branch 'jc/rw-prefix'
2006-06-13 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-06-10 Merge git://git.kernel.org/pub/scm/git/gitweb
2006-06-07 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-06-04 Merge branch 'new' of git://git./gitk/gitk into next
2006-06-01 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-05-29 Merge branch 'jc/dirwalk-n-cache-tree' into jc/cache...
2006-05-28 Merge branch 'jc/cache-tree' into next
2006-05-21 Merge branch 'master' into js/fmt-patch
2006-05-20 Merge branch 'jc/cache-tree' into jc/dirwalk-n-cache...
2006-05-20 Merge branch 'js/fetchconfig'
2006-05-19 Merge branch 'jc/apply'
2006-05-19 Merge part of 'js/fmt-patch' for RFC2822 dates into...
2006-05-18 Merge branch 'maint'
2006-05-17 Merge branch 'jc/apply' into next
2006-05-17 Merge branch 'jc/apply'
2006-05-17 Merge branch 'jc/gitlink' into next
2006-05-17 Merge branch 'maint'
2006-05-17 Merge branch 'np/pack'
2006-05-16 Merge branch 'np/pack' into next
2006-05-16 Merge branch 'se/tag'
2006-05-16 Merge branch 'se/rev-parse'
2006-05-16 Merge branch 'se/diff'
2006-05-16 Merge branch 'jc/diff' into next
2006-05-16 Merge branch 'master' into next
2006-05-16 Merge branch 'jc/apply' into next
2006-05-15 Merge branch 'jc/grep' into next
2006-05-15 Merge branch 'ew/send-email' into next
2006-05-15 Merge branch 'np/pack' into next
2006-05-15 Merge branch 'lt/oneway' into next
2006-05-15 Merge branch 'se/tag' into next
2006-05-15 Merge branch 'jc/grep' into next
2006-05-15 Merge branch 'jc/apply' into next
2006-05-15 Merge branch 'lt/oneway' into next
2006-05-15 Merge branch 'se/diff' into next
2006-05-14 Convert some "apply --summary" users to "diff --summary".
2006-05-03 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-04-24 Merge branch 'sh/daemon'
2006-04-24 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-04-21 Merge branch 'master' into jc/fmt-patch
2006-04-20 Merge branch 'jc/fmt-patch' into next
2006-04-20 Stop carrying Geert's similarity estimator.
2006-04-20 Merge branch 'jc/fmt-patch' into next
2006-04-19 Merge branch 'jc/unresolve' into next
2006-04-19 Merge branch 'lt/xsha1'
2006-04-19 Merge branch 'maint'
2006-04-19 git-merge: a bit more readable user guidance.
2006-04-17 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-04-07 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-04-07 Merge branch 'maint'
2006-04-05 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-04-05 Merge branch 'fix'
2006-04-04 Merge branch 'lt/fix-sol-pack'
2006-04-04 Merge branch 'lt/fix-sol-pack' into next
2006-04-02 Merge branch 'lt/fix-sol-pack' into next
2006-03-31 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-03-28 Merge branch ak/svn
2006-03-27 Merge branch 'lt/diffgen' into next
2006-03-26 Merge branches 'jc/clone' and 'jc/name'
2006-03-26 Merge branch 'jc/merge'
2006-03-26 Merge branch 'lt/diffgen' into next
2006-03-26 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-03-26 Merge branch 'ew/email' into next
2006-03-26 Merge branch 'lt/diffgen' into next
2006-03-26 Merge branch 'rs/tar-tree' into next
2006-03-24 Merge branch 'jc/name' into next
2006-03-22 Merge branch 'jc/pull' into next
2006-03-22 Merge branch 'jc/revlist' into next
2006-03-22 Merge branch 'jc/clone' into next
2006-03-21 Merge branch 'jc/clone' into next
2006-03-21 Merge branch 'jc/name' into next
2006-03-21 Merge branch 'jc/name' into next
2006-03-21 Merge branch 'jc/clone' into next
2006-03-20 Merge branch 'jc/merge' into next
2006-03-20 git-merge knows some strategies want to skip trivial...
2006-03-15 Merge branch 'lt/diff' into next
2006-03-15 Merge branch 'lt/diff' into next
2006-03-13 Merge branch 'jc/pack'
2006-03-13 Merge branch 'jc/fsck'
2006-03-13 Merge branch 'jc/diff' into next
2006-03-13 Merge branch 'jc/diff' into next
2006-03-13 Merge branch 'jc/diff' into next
2006-03-12 Merge branch 'jc/diff' into next
2006-03-11 Merge branch 'fk/blame' into next
2006-03-10 allow double click on current HEAD id after git-pull
next