summaryrefslogtreecommitdiff
path: root/wt-status.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jl/submodule-diff-dirtiness'Junio C Hamano2010-03-241-7/+38
|\
| * git status: ignoring untracked files must apply to submodules tooJens Lehmann2010-03-131-0/+2
| * git status: Show detailed dirty status of submodules in long formatJens Lehmann2010-03-081-7/+36
* | revision: introduce setup_revision_optJunio C Hamano2010-03-091-4/+11
|/
* Merge branch 'jl/submodule-diff'Junio C Hamano2010-01-221-5/+7
|\
| * git status: Show uncommitted submodule changes too when enabledJens Lehmann2010-01-171-5/+7
* | status: only touch path we may need to checkNguyễn Thái Ngọc Duy2010-01-151-1/+1
|/
* Merge branch 'jk/1.7.0-status'Junio C Hamano2009-12-271-9/+121
|\
| * status/commit: do not suggest "reset HEAD <path>" while mergingJunio C Hamano2009-12-121-4/+10
| * commit/status: "git add <path>" is not necessarily how to resolveJunio C Hamano2009-12-121-1/+1
| * status: reduce duplicated setup codeJeff King2009-12-071-0/+2
| * status: disable color for porcelain formatJeff King2009-12-071-0/+6
| * status -s: obey color.statusMichael J Gruber2009-12-051-7/+14
| * builtin-commit: refactor short-status code into wt-status.cMichael J Gruber2009-12-051-0/+89
| * git stat: the beginning of "status that is not a dry-run of commit"Junio C Hamano2009-08-221-4/+6
* | status: make "how to stage" messages optionalJeff King2009-09-111-0/+8
* | status: list unmerged files much laterJohannes Sixt2009-09-011-1/+1
* | Style fixes, add a space after if/for/while.Brian Gianforcaro2009-08-311-1/+1
|/
* wt-status: collect untracked files in a separate "collect" phaseJunio C Hamano2009-08-101-22/+36
* Make git_status_config() file scope static to builtin-commit.cJunio C Hamano2009-08-101-60/+0
* wt-status: move wt_status_colors[] into wt_status structureJunio C Hamano2009-08-101-4/+5
* wt-status: move many global settings to wt_status structureJunio C Hamano2009-08-101-41/+40
* status: show worktree status of conflicted paths separatelyJunio C Hamano2009-08-061-3/+92
* wt-status.c: rework the way changes to the index and work tree are summarizedJunio C Hamano2009-08-061-45/+181
* Add 'fill_directory()' helper function for directory traversalLinus Torvalds2009-07-091-1/+1
* Fix various sparse warnings in the git source codeLinus Torvalds2009-06-201-1/+1
* Fix a bunch of pointer declarations (codestyle)Felipe Contreras2009-05-011-1/+1
* Merge branch 'mv/parseopt-ls-files'Junio C Hamano2009-03-201-4/+3
|\
| * Turn the flags in struct dir_struct into a single variableJohannes Schindelin2009-02-181-4/+3
* | Clean up use of ANSI color sequencesArjen Laarhoven2009-02-131-5/+5
|/
* reorder ALLOW_TEXTCONV option settingJeff King2008-12-071-1/+1
* Merge branch 'jk/commit-v-strip'Junio C Hamano2008-11-161-27/+6
|\
| * status: show "-v" diff even for initial commitJeff King2008-11-121-2/+3
| * wt-status: refactor initial commit printingJeff King2008-11-121-25/+3
* | enable textconv for diff in verbose status/commitJeff King2008-10-261-0/+1
* | wt-status: load diff ui configJeff King2008-10-261-1/+9
|/
* Merge branch 'jk/maint-ls-files-other' into jk/fix-ls-files-otherJunio C Hamano2008-10-171-13/+2
|\
| * refactor handling of "other" files in ls-files and statusJeff King2008-10-171-13/+2
* | Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializerBrandon Casey2008-10-121-7/+3
* | wt-status: Teach how to discard changes in the working directoryAnders Melchiorsen2008-09-071-0/+1
* | wt-status: Split header generation into three functionsAnders Melchiorsen2008-09-071-15/+19
|/
* Merge branch 'jc/report-tracking'Junio C Hamano2008-07-131-0/+22
|\
| * git-status: show the remote tracking statisticsJunio C Hamano2008-07-021-0/+22
* | Fix "config_error_nonbool" used with value instead of keyChristian Couder2008-07-051-1/+1
|/
* Add configuration option for default untracked files modeMarius Storm-Olsen2008-06-091-0/+13
* Add argument 'no' commit/status option -u|--untracked-filesMarius Storm-Olsen2008-06-091-1/+6
* Add an optional <mode> argument to commit/status -u|--untracked-files optionMarius Storm-Olsen2008-06-091-0/+1
* Merge branch 'js/config-cb'v1.5.6-rc0Junio C Hamano2008-05-251-2/+2
|\
| * Provide git_config with a callback-data parameterJohannes Schindelin2008-05-141-2/+2
* | Updated status to show 'Not currently on any branch' in redChris Parsons2008-05-221-3/+8