summaryrefslogtreecommitdiff
path: root/wt-status.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jl/status-added-submodule-is-never-ignored'Junio C Hamano2014-06-161-1/+11
|\
| * status/commit: show staged submodules regardless of ignore configJens Lehmann2014-04-071-1/+11
* | Merge branch 'fc/status-printf-squelch-format-zero-length-warnings'Junio C Hamano2014-06-061-11/+11
|\ \
| * | silence a bunch of format-zero-length warningsfc/status-printf-squelch-format-zero-length-warningsFelipe Contreras2014-05-071-11/+11
* | | Merge branch 'mm/status-porcelain-format-i18n-fix'Junio C Hamano2014-03-311-5/+8
|\ \ \
| * | | status: disable translation when --porcelain is usedmm/status-porcelain-format-i18n-fixMatthieu Moy2014-03-261-5/+8
| |/ /
* | | Merge branch 'nd/commit-editor-cleanup'Junio C Hamano2014-03-251-8/+13
|\ \ \
| * | | wt-status.c: move cut-line print code out to wt_status_add_cut_lineNguyễn Thái Ngọc Duy2014-02-181-7/+12
| * | | wt-status.c: make cut_line[] const to shrink .data section a bitNguyễn Thái Ngọc Duy2014-02-181-1/+1
| | |/ | |/|
* | | Merge branch 'jn/wt-status'Junio C Hamano2014-03-211-42/+75
|\ \ \
| * | | wt-status: lift the artificual "at least 20 columns" floorjn/wt-statusJunio C Hamano2014-03-121-2/+0
| * | | wt-status: i18n of section labelsJonathan Nieder2014-03-121-19/+47
| * | | wt-status: extract the code to compute width for labelsJonathan Nieder2014-03-121-7/+15
| * | | wt-status: make full label string to be subject to l10nJunio C Hamano2014-03-121-18/+17
| |/ /
* | | pathspec: convert some match_pathspec_depth() to dir_path_match()Nguyễn Thái Ngọc Duy2014-02-241-2/+2
* | | pathspec: convert some match_pathspec_depth() to ce_path_match()Nguyễn Thái Ngọc Duy2014-02-241-1/+1
|/ /
* | 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
| |\
View Lorry Controller Status