Andrew's git - gitweb.git/history

[gitweb.git] / combine-diff.c

2006-04-11	Merge branch 'eb/apply' into next	blob \| diff \| raw
2006-04-11	Merge branch 'jc/withraw' into next	blob \| diff \| raw
2006-04-11	diff-* --patch-with-raw	blob \| diff \| raw
2006-04-08	Merge branch 'kh/svn'	blob \| diff \| raw \| diff to current
2006-04-08	Merge branch 'jc/thinpack'	blob \| diff \| raw \| diff to current
2006-04-08	Merge branch 'jc/date'	blob \| diff \| raw \| diff to current
2006-04-08	Merge branch 'nh/http'	blob \| diff \| raw \| diff to current
2006-04-08	Merge branch 'ew/rev-abbrev'	blob \| diff \| raw \| diff to current
2006-04-08	Merge branch 'jc/blame'	blob \| diff \| raw \| diff to current
2006-04-07	Merge branch 'master' into next	blob \| diff \| raw \| diff to current
2006-04-07	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2006-04-07	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2006-04-07	Merge branch 'jc/thinpack' into next	blob \| diff \| raw \| diff to current
2006-04-07	Merge branch 'ew/rev-abbrev' into next	blob \| diff \| raw \| diff to current
2006-04-07	Merge branch 'jc/blame' into next	blob \| diff \| raw \| diff to current
2006-04-07	Merge branch 'kh/svn' into next	blob \| diff \| raw \| diff to current
2006-04-07	Match ofs/cnt types in diff interface.	blob \| diff \| raw \| diff to current
2006-04-06	Merge branch 'master' into next	blob \| diff \| raw \| diff to current
2006-04-05	Merge branch 'jc/date' into next	blob \| diff \| raw \| diff to current
2006-04-05	Merge branch 'nh/http' into next	blob \| diff \| raw \| diff to current
2006-04-05	Merge branch 'jc/clone'	blob \| diff \| raw \| diff to current
2006-04-05	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2006-04-05	Merge branch 'jc/combine' into next	blob \| diff \| raw \| diff to current
2006-04-05	combine-diff: move the code to parse hunk-header into...	blob \| diff \| raw \| diff to current
2006-04-05	Merge branches 'master' and 'jc/combine' into next	blob \| diff \| raw \| diff to current
2006-04-05	Merge branch 'fix'	blob \| diff \| raw \| diff to current
2006-04-05	combine-diff: refactor built-in xdiff interface.	blob \| diff \| raw \| diff to current
2006-04-05	Merge branch 'nh/http' into next	blob \| diff \| raw \| diff to current
2006-04-05	Merge branch 'pb/regex' into next	blob \| diff \| raw \| diff to current
2006-04-04	Merge branch 'jc/combine' into next	blob \| diff \| raw \| diff to current
2006-04-04	combine-diff: use built-in xdiff.	blob \| diff \| raw \| diff to current
2006-04-04	Merge in xdiff cleanup pieces	blob \| diff \| raw \| diff to current
2006-04-04	Merge branch 'pe/cleanup'	blob \| diff \| raw \| diff to current
2006-04-04	Merge branch 'lt/fix-sol-pack'	blob \| diff \| raw \| diff to current
2006-04-04	Merge branch 'pe/cleanup' into next	blob \| diff \| raw \| diff to current
2006-04-04	Use blob_, commit_, tag_, and tree_type throughout.	blob \| diff \| raw \| diff to current
2006-04-04	Merge branch 'lt/fix-sol-pack' into next	blob \| diff \| raw \| diff to current
2006-04-02	Merge branch 'lt/fix-sol-pack' into next	blob \| diff \| raw \| diff to current
2006-03-31	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2006-03-30	tree/diff header cleanup.	blob \| diff \| raw \| diff to current
2006-03-26	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2006-03-04	Merge branch 'fk/blame'	blob \| diff \| raw \| diff to current
2006-03-04	Merge branch 'lt/rev-list'	blob \| diff \| raw \| diff to current
2006-03-04	Merge branch 'fk/blame' into next	blob \| diff \| raw \| diff to current
2006-03-04	Merge branch 'lt/rev-list' into next	blob \| diff \| raw \| diff to current
2006-03-03	Merge branch 'fk/blame' into next	blob \| diff \| raw \| diff to current
2006-03-03	Merge branch 'lt/rev-list' into next	blob \| diff \| raw \| diff to current
2006-03-02	Merge branch 'kh/svnimport'	blob \| diff \| raw \| diff to current
2006-03-02	Merge branch 'lt/fix-apply' into maint v1.2.4	blob \| diff \| raw \| diff to current
2006-03-02	Merge branch 'lt/apply'	blob \| diff \| raw \| diff to current
2006-03-02	Merge early parts of 'np/delta' branch	blob \| diff \| raw \| diff to current
2006-03-01	combine-diff: Honour -z option correctly.	blob \| diff \| raw \| diff to current
2006-03-01	combine-diff: Honour --full-index.	blob \| diff \| raw \| diff to current
2006-03-01	Merge branch 'lt/rev-list' into next	blob \| diff \| raw \| diff to current
2006-03-01	Merge branch 'lt/rev-list' into next	blob \| diff \| raw \| diff to current
2006-03-01	Merge branch 'lt/apply' into next	blob \| diff \| raw \| diff to current
2006-02-28	Merge part of np/delta	blob \| diff \| raw \| diff to current
2006-02-28	Merge branch 'lt/apply' into next	blob \| diff \| raw \| diff to current
2006-02-27	Merge branch 'master' into next	blob \| diff \| raw \| diff to current
2006-02-27	Merge part of kh/svnimport branch into master	blob \| diff \| raw \| diff to current
2006-02-27	combine-diff: Honour -z option correctly.	blob \| diff \| raw \| diff to current
2006-02-27	combine-diff: Honour --full-index.	blob \| diff \| raw \| diff to current
2006-02-22	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2006-02-22	Merge branch 'jc/nostat'	blob \| diff \| raw \| diff to current
2006-02-18	Merge branch 'jc/rebase-limit'	blob \| diff \| raw \| diff to current
2006-02-15	Merge branch 'jc/rebase-limit'	blob \| diff \| raw \| diff to current
2006-02-15	Merge branch 'master'	blob \| diff \| raw \| diff to current
2006-02-15	Merge branch 'kh/svn'	blob \| diff \| raw \| diff to current
2006-02-15	Merge branch 'jc/commit'	blob \| diff \| raw \| diff to current
2006-02-14	combine-diff: diff-files fix.	blob \| diff \| raw \| diff to current
2006-02-13	Merge branch 'jc/nostat'	blob \| diff \| raw \| diff to current
2006-02-12	Merge branch 'jc/nostat'	blob \| diff \| raw \| diff to current
2006-02-11	Merge branch 'lt/diff-tree'	blob \| diff \| raw \| diff to current
2006-02-10	Merge branch 'master'	blob \| diff \| raw \| diff to current
2006-02-10	Merge branch 'lt/diff-tree'	blob \| diff \| raw \| diff to current
2006-02-10	combine-diff: Record diff status a bit more faithfully	blob \| diff \| raw \| diff to current
2006-02-10	find_unique_abbrev() simplification.	blob \| diff \| raw \| diff to current
2006-02-10	Merge branch 'jc/status'	blob \| diff \| raw \| diff to current
2006-02-10	Merge branch 'master'	blob \| diff \| raw \| diff to current
2006-02-10	Merge branch 'lt/diff-tree'	blob \| diff \| raw \| diff to current
2006-02-09	combine-diff: move formatting logic to show_combined_diff()	blob \| diff \| raw \| diff to current
2006-02-09	combined-diff: use diffcore before intersecting paths.	blob \| diff \| raw \| diff to current
2006-02-09	diff-tree -c raw output	blob \| diff \| raw \| diff to current
2006-02-07	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2006-02-07	combine-diff: do not punt on removed or added files.	blob \| diff \| raw \| diff to current
2006-02-06	combine-diff: show mode changes as well.	blob \| diff \| raw \| diff to current
2006-02-06	combine-diff: do not send NULL to printf	blob \| diff \| raw \| diff to current
2006-02-06	Merge branch 'jc/diff'	blob \| diff \| raw \| diff to current
2006-02-06	combine-diff: remove misguided --show-empty hack.	blob \| diff \| raw \| diff to current
2006-02-04	Merge branches 'jc/sha1', 'jc/diff' and 'jc/ws'	blob \| diff \| raw \| diff to current
2006-02-03	combine-diff: finishing touches to git-diff-tree --cc	blob \| diff \| raw \| diff to current
2006-02-03	combine-diff: cleanup.	blob \| diff \| raw \| diff to current
2006-02-03	combine-diff: show parent line numbers as well.	blob \| diff \| raw \| diff to current
2006-02-03	combine-diff: add a bit more comments.	blob \| diff \| raw \| diff to current
2006-02-02	combine-diff: fix placement of deletion.	blob \| diff \| raw \| diff to current
2006-02-02	combine-diff: add safety check to --cc.	blob \| diff \| raw \| diff to current
2006-02-02	combine-diff: update --cc "uninteresting hunks" logic.	blob \| diff \| raw \| diff to current
2006-02-02	combine-diff: reuse diff from the same blob.	blob \| diff \| raw \| diff to current
2006-01-30	Merge fixes up to GIT 1.1.6	blob \| diff \| raw \| diff to current
2006-01-28	Merge lt/revlist,jc/diff,jc/revparse,jc/abbrev	blob \| diff \| raw \| diff to current
next