| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'mm/status-porcelain-format-i18n-fix' | Junio C Hamano | 2014-03-31 | 1 | -5/+8 |
|\ |
|
| * | status: disable translation when --porcelain is usedmm/status-porcelain-format-i18n-fix | Matthieu Moy | 2014-03-26 | 1 | -5/+8 |
* | | Merge branch 'nd/commit-editor-cleanup' | Junio C Hamano | 2014-03-25 | 1 | -8/+13 |
|\ \ |
|
| * | | wt-status.c: move cut-line print code out to wt_status_add_cut_line | Nguyễn Thái Ngọc Duy | 2014-02-18 | 1 | -7/+12 |
| * | | wt-status.c: make cut_line[] const to shrink .data section a bit | Nguyễn Thái Ngọc Duy | 2014-02-18 | 1 | -1/+1 |
* | | | Merge branch 'jn/wt-status' | Junio C Hamano | 2014-03-21 | 1 | -42/+75 |
|\ \ \ |
|
| * | | | wt-status: lift the artificual "at least 20 columns" floorjn/wt-status | Junio C Hamano | 2014-03-12 | 1 | -2/+0 |
| * | | | wt-status: i18n of section labels | Jonathan Nieder | 2014-03-12 | 1 | -19/+47 |
| * | | | wt-status: extract the code to compute width for labels | Jonathan Nieder | 2014-03-12 | 1 | -7/+15 |
| * | | | wt-status: make full label string to be subject to l10n | Junio C Hamano | 2014-03-12 | 1 | -18/+17 |
| |/ / |
|
* | | | pathspec: convert some match_pathspec_depth() to dir_path_match() | Nguyễn Thái Ngọc Duy | 2014-02-24 | 1 | -2/+2 |
* | | | pathspec: convert some match_pathspec_depth() to ce_path_match() | Nguyễn Thái Ngọc Duy | 2014-02-24 | 1 | -1/+1 |
|/ / |
|
* | | Merge branch 'cc/starts-n-ends-with' | Junio C Hamano | 2013-12-17 | 1 | -8/+8 |
|\ \ |
|
| * | | replace {pre,suf}fixcmp() with {starts,ends}_with()cc/starts-n-ends-with | Christian Couder | 2013-12-05 | 1 | -8/+8 |
* | | | Merge branch 'jl/commit-v-strip-marker' | Junio C Hamano | 2013-12-17 | 1 | -2/+27 |
|\ \ \
| | |/
| |/| |
|
| * | | commit -v: strip diffs and submodule shortlogs from the commit messagejl/commit-v-strip-marker | Jens Lehmann | 2013-12-05 | 1 | -2/+27 |
| |/ |
|
* | | wt-status: take the alignment burden off translatorsnd/wt-status-align-i18n | Nguyễn Thái Ngọc Duy | 2013-11-06 | 1 | -27/+53 |
|/ |
|
* | status: show commit sha1 in "You are currently cherry-picking" messagert/cherry-pick-status | Ralf Thielow | 2013-10-11 | 1 | -2/+5 |
* | Merge branch 'mm/commit-template-squelch-advice-messages' | Junio C Hamano | 2013-09-20 | 1 | -19/+19 |
|\ |
|
| * | wt-status: turn advice_status_hints into a field of wt_status | Matthieu Moy | 2013-09-12 | 1 | -19/+19 |
* | | Merge branch 'mm/status-without-comment-char' | Junio C Hamano | 2013-09-20 | 1 | -22/+69 |
|\ \ |
|
| * | | status: add missing blank line after list of "other" files | Matthieu Moy | 2013-09-06 | 1 | -1/+3 |
| * | | status: disable display of '#' comment prefix by default | Matthieu Moy | 2013-09-06 | 1 | -11/+29 |
| * | | submodule summary: ignore --for-status option | Matthieu Moy | 2013-09-06 | 1 | -1/+26 |
| * | | wt-status: use argv_array API | Matthieu Moy | 2013-09-06 | 1 | -12/+14 |
| |/ |
|
* | | Merge branch 'jx/branch-vv-always-compare-with-upstream' | Junio C Hamano | 2013-09-20 | 1 | -4/+22 |
|\ \ |
|
| * | | status: always show tracking branch even no change | Jiang Xin | 2013-08-26 | 1 | -5/+5 |
| * | | branch: report invalid tracking branch as gone | Jiang Xin | 2013-08-26 | 1 | -4/+22 |
| |/ |
|
* | | Merge branch 'jl/submodule-mv' | Junio C Hamano | 2013-09-09 | 1 | -9/+7 |
|\ \
| |/
|/| |
|
| * | convert {read,fill}_directory to take struct pathspec | Nguyễn Thái Ngọc Duy | 2013-07-15 | 1 | -1/+1 |
| * | status: convert to use parse_pathspec | Nguyễn Thái Ngọc Duy | 2013-07-15 | 1 | -9/+7 |
* | | Merge branch 'jx/clean-interactive' | Junio C Hamano | 2013-07-22 | 1 | -9/+8 |
|\ \ |
|
| * | | quote_path_relative(): remove redundant parameter | Jiang Xin | 2013-06-26 | 1 | -9/+8 |
* | | | Merge branch 'nd/const-struct-cache-entry' | Junio C Hamano | 2013-07-22 | 1 | -2/+2 |
|\ \ \
| |_|/
|/| | |
|
| * | | Convert "struct cache_entry *" to "const ..." wherever possiblend/const-struct-cache-entry | Nguyễn Thái Ngọc Duy | 2013-07-09 | 1 | -2/+2 |
* | | | Merge branch 'jg/status-config' | Junio C Hamano | 2013-07-11 | 1 | -0/+1 |
|\ \ \ |
|
| * | | | status/commit: make sure --porcelain is not affected by user-facing config | Junio C Hamano | 2013-06-24 | 1 | -0/+1 |
| | |/
| |/| |
|
* | | | Merge branch 'rr/rebase-checkout-reflog' | Junio C Hamano | 2013-07-11 | 1 | -3/+4 |
|\ \ \
| |_|/
|/| | |
|
| * | | status: do not depend on rebase reflog messages | Ramkumar Ramachandra | 2013-06-17 | 1 | -1/+4 |
| * | | wt-status: remove unused field in grab_1st_switch_cbdata | Ramkumar Ramachandra | 2013-06-17 | 1 | -2/+0 |
| |/ |
|
* | | am: replace uses of --resolved with --continue | Kevin Bracey | 2013-06-27 | 1 | -1/+1 |
* | | wt-status: give better advice when cherry-pick is in progress | Ralf Thielow | 2013-06-17 | 1 | -2/+4 |
|/ |
|
* | dir.c: git-status --ignored: don't scan the work tree twice | Karsten Blees | 2013-04-15 | 1 | -13/+11 |
* | dir.c: git-ls-files --directories: don't hide empty directories | Karsten Blees | 2013-04-15 | 1 | -1/+1 |
* | Sync with 'maint' | Junio C Hamano | 2013-04-12 | 1 | -8/+4 |
|\ |
|
| * | Merge branch 'tb/document-status-u-tradeoff' into maint | Junio C Hamano | 2013-04-12 | 1 | -8/+4 |
| |\ |
|
| | * | i18n: make the translation of -u advice in one go | Jiang Xin | 2013-04-12 | 1 | -8/+4 |
| * | | Merge branch 'tb/document-status-u-tradeoff' into maint | Junio C Hamano | 2013-04-01 | 1 | -0/+25 |
| |\ \
| | |/ |
|
* | | | status: show commit sha1 in "You are currently reverting" message | Matthieu Moy | 2013-04-02 | 1 | -2/+6 |
* | | | status: show 'revert' state and status hint | Matthieu Moy | 2013-04-02 | 1 | -0/+23 |