Merge branch 'jc/merge' into next
[gitweb.git] / combine-diff.c
2006-03-04 Merge branch 'fk/blame'
2006-03-04 Merge branch 'lt/rev-list'
2006-03-04 Merge branch 'fk/blame' into next
2006-03-04 Merge branch 'lt/rev-list' into next
2006-03-03 Merge branch 'fk/blame' into next
2006-03-03 Merge branch 'lt/rev-list' into next
2006-03-02 Merge branch 'kh/svnimport'
2006-03-02 Merge branch 'lt/fix-apply' into maint v1.2.4
2006-03-02 Merge branch 'lt/apply'
2006-03-02 Merge early parts of 'np/delta' branch
2006-03-01 combine-diff: Honour -z option correctly.
2006-03-01 combine-diff: Honour --full-index.
2006-03-01 Merge branch 'lt/rev-list' into next
2006-03-01 Merge branch 'lt/rev-list' into next
2006-03-01 Merge branch 'lt/apply' into next
2006-02-28 Merge part of np/delta
2006-02-28 Merge branch 'lt/apply' into next
2006-02-27 Merge branch 'master' into next
2006-02-27 Merge part of kh/svnimport branch into master
2006-02-27 combine-diff: Honour -z option correctly.
2006-02-27 combine-diff: Honour --full-index.
2006-02-22 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-02-22 Merge branch 'jc/nostat'
2006-02-18 Merge branch 'jc/rebase-limit'
2006-02-15 Merge branch 'jc/rebase-limit'
2006-02-15 Merge branch 'master'
2006-02-15 Merge branch 'kh/svn'
2006-02-15 Merge branch 'jc/commit'
2006-02-14 combine-diff: diff-files fix.
2006-02-13 Merge branch 'jc/nostat'
2006-02-12 Merge branch 'jc/nostat'
2006-02-11 Merge branch 'lt/diff-tree'
2006-02-10 Merge branch 'master'
2006-02-10 Merge branch 'lt/diff-tree'
2006-02-10 combine-diff: Record diff status a bit more faithfully
2006-02-10 find_unique_abbrev() simplification.
2006-02-10 Merge branch 'jc/status'
2006-02-10 Merge branch 'master'
2006-02-10 Merge branch 'lt/diff-tree'
2006-02-09 combine-diff: move formatting logic to show_combined_diff()
2006-02-09 combined-diff: use diffcore before intersecting paths.
2006-02-09 diff-tree -c raw output
2006-02-07 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-02-07 combine-diff: do not punt on removed or added files.
2006-02-06 combine-diff: show mode changes as well.
2006-02-06 combine-diff: do not send NULL to printf
2006-02-06 Merge branch 'jc/diff'
2006-02-06 combine-diff: remove misguided --show-empty hack.
2006-02-04 Merge branches 'jc/sha1', 'jc/diff' and 'jc/ws'
2006-02-03 combine-diff: finishing touches to git-diff-tree --cc
2006-02-03 combine-diff: cleanup.
2006-02-03 combine-diff: show parent line numbers as well.
2006-02-03 combine-diff: add a bit more comments.
2006-02-02 combine-diff: fix placement of deletion.
2006-02-02 combine-diff: add safety check to --cc.
2006-02-02 combine-diff: update --cc "uninteresting hunks" logic.
2006-02-02 combine-diff: reuse diff from the same blob.
2006-01-30 Merge fixes up to GIT 1.1.6
2006-01-28 Merge lt/revlist,jc/diff,jc/revparse,jc/abbrev
2006-01-28 diff-files: -c and --cc options.
2006-01-28 combine-diff: better hunk splitting.
2006-01-28 diff-tree --cc: squelch header generation on empty...
2006-01-28 combine-diff: extend --cc logic to Octopus.
2006-01-28 combine-diff: minor output changes.
2006-01-28 combine-diff: fix appending at the tail of a list.
2006-01-28 diff-tree --cc: denser combined diff output for a merge...
2006-01-28 diff-tree -c: show a merge commit a bit more sensibly.