Document git-rebase behavior on conflicts.
[git] / name-rev.c
2006-03-26  Junio C HamanoMerge branches 'jc/clone' and 'jc/name'
2006-03-26  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-03-24  Junio C Hamanosha1_name: warning ambiguous refs.
2006-02-22  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-02-22  Junio C HamanoMerge branch 'jc/nostat'
2006-02-13  Junio C HamanoMerge branch 'jc/nostat'
2006-02-12  Junio C HamanoMerge branch 'master'
2006-02-12  Johannes SchindelinUse a hashtable for objects instead of a sorted list
2006-02-07  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-01-16  Junio C HamanoMerge branch 'fixo/1.0'
2006-01-14  Junio C HamanoMerge fixes up to GIT 1.1.2
2006-01-14  Junio C HamanoGIT 1.1.2 v1.1.2
2006-01-14  Junio C HamanoGIT 1.0.10 v1.0.10
2006-01-11  Junio C Hamanoname-rev: do not omit leading components of ref name.
2005-12-07  Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk
2005-12-04  Junio C HamanoGIT 0.99.9l aka 1.0rc4 v0.99.9l v1.0rc4
2005-11-29  Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-29  Junio C Hamanoname-rev: fix parent counting.
2005-11-28  Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-27  Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-26  Junio C Hamanoname-rev: fix off-by-one error in --stdin.
2005-11-26  Junio C HamanoGIT 0.99.9k v0.99.9k
2005-11-22  Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-21  Timo HirvonenFix sparse warnings
2005-11-20  Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-19  Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-07  Junio C HamanoGIT 0.99.9e v0.99.9e
2005-11-03  Junio C HamanoGIT 0.99.9c v0.99.9c
2005-11-03  Junio C HamanoBe careful when dereferencing tags.
2005-10-31  Junio C HamanoGIT 0.99.9a v0.99.9a
2005-10-27  Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk
2005-10-26  Johannes SchindelinAdd git-name-rev