Fix earlier mismerges.
[gitweb.git] / Documentation / git-am.txt
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-03 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-04-24 Merge git://git.kernel.org/pub/scm/gitk/gitk
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-26 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-03-05 Cauterize dropped or duplicate bits from next.
2006-03-04 Merge jc/diff leftover bits.
2006-03-04 Merge part of 'sp/checkout'
2006-03-04 Merge branch 'fk/blame'
2006-03-04 Merge branch 'lt/rev-list'
2006-03-04 Merge part of 'sp/checkout'
2006-03-04 Merge branch 'fk/blame' into next
2006-03-04 Merge branch 'lt/rev-list' into next
2006-03-04 Merge branch 'jc/diff' into next
2006-03-04 Merge branch 'maint'
2006-03-03 Merge branch 'cvsserver' of locke.catalyst.net.nz/git...
2006-03-03 Merge branch 'jc/delta' into next
2006-03-03 Merge branch 'jc/diff' into next
2006-03-03 Merge branch 'fk/blame' into next
2006-03-03 Merge branch 'lt/rev-list' into next
2006-03-03 Merge branch 'master' into next
2006-03-03 Merge branch 'jc/diff'
2006-03-02 Merge branch 'ml/cvsserver'
2006-03-02 war on whitespaces: documentation.
2006-02-22 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-02-07 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-01-06 Merge fixes up to GIT 1.0.7
2006-01-06 GIT 1.0.7 v1.0.7
2006-01-06 Wrap synopsis lines and use [verse] to keep formatting
2005-12-15 GIT 0.99.9n aka 1.0rc6 v0.99.9nv1.0rc6
2005-12-13 Documentation: more examples.
2005-12-12 GIT 0.99.9m aka 1.0rc5 v0.99.9mv1.0rc5
2005-12-08 Fix the description of --utf8 and --keep to git-am.
2005-12-07 Merge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-29 Merge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-28 Merge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-27 Merge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-22 Merge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-20 Merge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-19 Merge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-18 Merge branch 'master'
2005-11-18 git-am: --binary; document --resume and --binary.
2005-11-07 GIT 0.99.9e v0.99.9e
2005-11-02 GIT 0.99.9b v0.99.9b
2005-11-01 git-am.txt is no stub anymore
2005-10-31 GIT 0.99.9a v0.99.9a
2005-10-27 Merge http://www.kernel.org/pub/scm/gitk/gitk
2005-10-26 git-am: make it easier after fixing up an unapplicable...
2005-10-23 Merge branch 'fixes'
2005-10-22 Fix malformatted git-am documentation.
2005-10-21 Merge branch 'fixes'
2005-10-21 Finish git-am documentation.
2005-10-21 Brief documentation for the mysterious git-am script