summaryrefslogtreecommitdiff
path: root/wt-status.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'cc/starts-n-ends-with'Junio C Hamano2013-12-171-8/+8
|\
| * replace {pre,suf}fixcmp() with {starts,ends}_with()cc/starts-n-ends-withChristian Couder2013-12-051-8/+8
* | Merge branch 'jl/commit-v-strip-marker'Junio C Hamano2013-12-171-2/+27
|\ \
| * | commit -v: strip diffs and submodule shortlogs from the commit messagejl/commit-v-strip-markerJens Lehmann2013-12-051-2/+27
| |/
* | wt-status: take the alignment burden off translatorsnd/wt-status-align-i18nNguyễn Thái Ngọc Duy2013-11-061-27/+53
|/
* status: show commit sha1 in "You are currently cherry-picking" messagert/cherry-pick-statusRalf Thielow2013-10-111-2/+5
* Merge branch 'mm/commit-template-squelch-advice-messages'Junio C Hamano2013-09-201-19/+19
|\
| * wt-status: turn advice_status_hints into a field of wt_statusMatthieu Moy2013-09-121-19/+19
* | Merge branch 'mm/status-without-comment-char'Junio C Hamano2013-09-201-22/+69
|\ \
| * | status: add missing blank line after list of "other" filesMatthieu Moy2013-09-061-1/+3
| * | status: disable display of '#' comment prefix by defaultMatthieu Moy2013-09-061-11/+29
| * | submodule summary: ignore --for-status optionMatthieu Moy2013-09-061-1/+26
| * | wt-status: use argv_array APIMatthieu Moy2013-09-061-12/+14
| |/
* | Merge branch 'jx/branch-vv-always-compare-with-upstream'Junio C Hamano2013-09-201-4/+22
|\ \
| * | status: always show tracking branch even no changeJiang Xin2013-08-261-5/+5
| * | branch: report invalid tracking branch as goneJiang Xin2013-08-261-4/+22
| |/
* | Merge branch 'jl/submodule-mv'Junio C Hamano2013-09-091-9/+7
|\ \ | |/ |/|
| * convert {read,fill}_directory to take struct pathspecNguyễn Thái Ngọc Duy2013-07-151-1/+1
| * status: convert to use parse_pathspecNguyễn Thái Ngọc Duy2013-07-151-9/+7
* | Merge branch 'jx/clean-interactive'Junio C Hamano2013-07-221-9/+8
|\ \
| * | quote_path_relative(): remove redundant parameterJiang Xin2013-06-261-9/+8
* | | Merge branch 'nd/const-struct-cache-entry'Junio C Hamano2013-07-221-2/+2
|\ \ \ | |_|/ |/| |
| * | Convert "struct cache_entry *" to "const ..." wherever possiblend/const-struct-cache-entryNguyễn Thái Ngọc Duy2013-07-091-2/+2
* | | Merge branch 'jg/status-config'Junio C Hamano2013-07-111-0/+1
|\ \ \
| * | | status/commit: make sure --porcelain is not affected by user-facing configJunio C Hamano2013-06-241-0/+1
| | |/ | |/|
* | | Merge branch 'rr/rebase-checkout-reflog'Junio C Hamano2013-07-111-3/+4
|\ \ \ | |_|/ |/| |
| * | status: do not depend on rebase reflog messagesRamkumar Ramachandra2013-06-171-1/+4
| * | wt-status: remove unused field in grab_1st_switch_cbdataRamkumar Ramachandra2013-06-171-2/+0
| |/
* | am: replace uses of --resolved with --continueKevin Bracey2013-06-271-1/+1
* | wt-status: give better advice when cherry-pick is in progressRalf Thielow2013-06-171-2/+4
|/
* dir.c: git-status --ignored: don't scan the work tree twiceKarsten Blees2013-04-151-13/+11
* dir.c: git-ls-files --directories: don't hide empty directoriesKarsten Blees2013-04-151-1/+1
* Sync with 'maint'Junio C Hamano2013-04-121-8/+4
|\
| * Merge branch 'tb/document-status-u-tradeoff' into maintJunio C Hamano2013-04-121-8/+4
| |\
| | * i18n: make the translation of -u advice in one goJiang Xin2013-04-121-8/+4
| * | Merge branch 'tb/document-status-u-tradeoff' into maintJunio C Hamano2013-04-011-0/+25
| |\ \ | | |/
* | | status: show commit sha1 in "You are currently reverting" messageMatthieu Moy2013-04-021-2/+6
* | | status: show 'revert' state and status hintMatthieu Moy2013-04-021-0/+23
* | | Merge branch 'nd/branch-show-rebase-bisect-state'Junio C Hamano2013-04-011-62/+144
|\ \ \
| * | | status, branch: fix the misleading "bisecting" messageNguyễn Thái Ngọc Duy2013-03-231-1/+1
| * | | status: show more info than "currently not on any branch"Nguyễn Thái Ngọc Duy2013-03-161-4/+85
| * | | wt-status: move wt_status_get_state() out to wt_status_print()Nguyễn Thái Ngọc Duy2013-03-161-19/+20
| * | | wt-status: split wt_status_state parsing function outNguyễn Thái Ngọc Duy2013-03-161-18/+23
| * | | wt-status: move strbuf into read_and_strip_branch()Nguyễn Thái Ngọc Duy2013-03-161-35/+30
* | | | Merge branch 'maint'Junio C Hamano2013-03-211-1/+4
|\ \ \ \ | | |/ / | |/| |
| * | | wt-status: fix possible use of uninitialized variableJeff King2013-03-211-1/+4
* | | | Merge branch 'tb/document-status-u-tradeoff'Junio C Hamano2013-03-211-0/+25
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | status: advise to consider use of -u when read_directory takes too longNguyễn Thái Ngọc Duy2013-03-161-0/+25
* | | Merge branch 'nd/status-show-in-progress'Junio C Hamano2013-02-141-6/+88
|\ \ \ | | |/ | |/|
| * | status: show the branch name if possible in in-progress infoNguyễn Thái Ngọc Duy2013-02-051-6/+88
View Lorry Controller Status