summaryrefslogtreecommitdiff
path: root/wt-status.c
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | Merge branch 'jc/custom-comment-char'Junio C Hamano2013-02-041-4/+6
|\ \ \ | |/ / |/| |
| * | Allow custom "comment char"Junio C Hamano2013-01-161-4/+6
| |/
* | Merge branch 'ap/status-ignored-in-ignored-directory'Junio C Hamano2013-01-141-1/+3
|\ \ | |/ |/|
| * dir.c: Make git-status --ignored more consistentAntoine Pelisse2013-01-011-1/+3
* | wt-status.c: mark a private file-scope symbol as staticJunio C Hamano2012-09-151-2/+2
* | status: remove i18n legosNguyễn Thái Ngọc Duy2012-09-061-20/+28
|/
* status: color in-progress message like other header messagesJeff King2012-07-161-2/+1
* status: better advices when splitting a commit (during rebase -i)Lucien Kong2012-06-141-0/+52
* status: don't suggest "git rm" or "git add" if not appropriateLucien Kong2012-06-141-1/+36
* wt-status.*: better advices for git status addedLucien Kong2012-06-141-0/+156
* Merge branch 'jk/maint-status-porcelain-z-b' into HEADJeff King2012-05-081-17/+18
|\
| * status: respect "-b" for porcelain formatJeff King2012-05-081-3/+3
| * status: fix null termination with "-b"Jeff King2012-05-081-3/+4
| * status: refactor null_termination optionJeff King2012-05-081-13/+13
* | status: add --columnNguyễn Thái Ngọc Duy2012-04-271-2/+26
|/
* Convert resolve_ref+xstrdup to new resolve_refdup functionNguyễn Thái Ngọc Duy2011-12-131-3/+1
* Merge branch 'maint-1.7.3' into maintJunio C Hamano2011-10-231-1/+1
|\
| * Reindent closing bracket using tab instead of spacesNguyễn Thái Ngọc Duy2011-10-231-1/+1
* | Merge branch 'jk/color-and-pager'Junio C Hamano2011-08-281-2/+4
|\ \
View Lorry Controller Status