summaryrefslogtreecommitdiff
path: root/builtin/diff.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ab/i18n-st'Junio C Hamano2011-04-011-9/+9
|\
| * i18n: git-diff basic messagesÆvar Arnfjörð Bjarmason2011-03-091-9/+9
* | Merge branch 'jc/index-update-if-able'Junio C Hamano2011-03-261-6/+1
|\ \
| * | diff/status: refactor opportunistic index updateJunio C Hamano2011-03-211-6/+1
* | | Merge branch 'nd/struct-pathspec'Junio C Hamano2011-02-271-10/+6
|\ \ \ | |_|/ |/| |
| * | struct rev_info: convert prune_data to struct pathspecNguyễn Thái Ngọc Duy2011-02-031-8/+4
| * | Convert struct diff_options to use struct pathspecNguyễn Thái Ngọc Duy2011-02-031-2/+2
* | | diff: support --cached on unborn branchesNguyễn Thái Ngọc Duy2011-02-071-2/+5
|/ /
* | diff,difftool: Don't use the {0,2} notation in usage stringsŠtěpán Němec2010-11-051-1/+1
|/
* Submodules: Use "ignore" settings from .gitmodules too for diff and statusJens Lehmann2010-08-091-0/+2
* Merge branch 'jc/diff-merge-base-multi'Junio C Hamano2010-07-161-13/+0
* Merge branch 'jc/diff-merge-base-multi'Junio C Hamano2010-07-151-8/+23
* Move 'builtin-*' into a 'builtin/' subdirectoryLinus Torvalds2010-02-221-0/+425