summaryrefslogtreecommitdiff
path: root/wt-status.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'bc/object-id-part17'Junio C Hamano2019-10-111-1/+1
|\
| * wt-status: convert struct wt_status to object_idbrian m. carlson2019-08-191-1/+1
* | status: mention --skip for revert and cherry-pickDenton Liu2019-08-271-0/+4
|/
* Merge branch 'jl/status-reduce-vertical-blank'Junio C Hamano2019-07-191-4/+0
|\
| * status: remove the empty line after hintsJohn Lin2019-06-211-4/+0
* | Merge branch 'jh/status-aheadbehind'Junio C Hamano2019-07-091-0/+17
|\ \
| * | status: warn when a/b calculation takes too longJeff Hostetler2019-06-211-0/+17
* | | Merge branch 'nd/switch-and-restore'Junio C Hamano2019-07-091-7/+19
|\ \ \ | | |/ | |/|
| * | doc: promote "git restore"Nguyễn Thái Ngọc Duy2019-05-071-7/+19
* | | Merge branch 'md/sort-detached-head-first'Junio C Hamano2019-07-091-2/+2
|\ \ \ | |_|/ |/| |
| * | ref-filter: sort detached HEAD lines firstlyMatthew DeVore2019-06-191-2/+2
* | | Merge branch 'jk/unused-params-final-batch'Junio C Hamano2019-06-131-4/+2
|\ \ \
| * | | wt-status: drop unused status parameterJeff King2019-05-131-4/+2
* | | | Merge branch 'js/rebase-i-label-shown-in-status-fix'Junio C Hamano2019-05-191-1/+3
|\ \ \ \
| * | | | status: fix display of rebase -ir's `label` commandJohannes Schindelin2019-05-131-1/+3
| |/ / /
* | | | Merge branch 'pw/clean-sequencer-state-upon-final-commit'Junio C Hamano2019-05-131-5/+34
|\ \ \ \ | |/ / / |/| | |
| * | | fix cherry-pick/revert status after commitPhillip Wood2019-04-171-5/+34
| |/ /
* | | Merge branch 'dr/ref-filter-push-track-fix'Junio C Hamano2019-05-091-2/+2
|\ \ \
| * | | ref-filter: use correct branch for %(push:track)Damien Robert2019-04-181-2/+2
| |/ /
* | | merge: cleanup messages like commitDenton Liu2019-04-181-3/+9
| |/ |/|
* | trace2:data: add trace2 regions to wt-statusJeff Hostetler2019-02-221-2/+22
|/
* read-cache.c: replace update_index_if_able with repo_&Nguyễn Thái Ngọc Duy2019-01-141-1/+1
* repository.c: replace hold_locked_index() with repo_hold_locked_index()Nguyễn Thái Ngọc Duy2019-01-141-1/+1
* Merge branch 'nd/the-index'Junio C Hamano2019-01-041-41/+53
|\
| * wt-status.c: remove implicit dependency the_repositoryNguyễn Thái Ngọc Duy2018-11-121-8/+10
| * wt-status.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-11-121-33/+43
* | status: rebase and merge can be in progress at the same timeJohannes Schindelin2018-11-131-2/+7
|/
* Merge branch 'ss/wt-status-committable'Junio C Hamano2018-10-191-89/+82
|\
| * roll wt_status_state into wt_status and populate in the collect phaseStephen P. Smith2018-10-031-75/+59
| * wt-status.c: set the committable flag in the collect phaseStephen P. Smith2018-09-071-2/+11
| * wt-status: rename commitable to committableStephen P. Smith2018-09-071-5/+5
| * wt-status.c: move has_unmerged earlier in the fileStephen P. Smith2018-09-071-13/+13
* | Merge branch 'nd/the-index'Junio C Hamano2018-10-191-5/+5
|\ \
| * | revision.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-09-211-5/+5
| |/
* | convert "oidcmp() == 0" to oideq()Jeff King2018-08-291-5/+5
|/
* dir.c: remove an implicit dependency on the_index in pathspec codeNguyễn Thái Ngọc Duy2018-08-131-3/+3
* Merge branch 'sb/object-store-lookup'Junio C Hamano2018-08-021-2/+2
|\
| * commit: add repository argument to lookup_commit_reference_gentlyStefan Beller2018-06-291-1/+1
| * Merge branch 'sb/object-store-grafts' into sb/object-store-lookupJunio C Hamano2018-06-291-4/+4
| |\
* | \ Merge branch 'jk/has-uncommitted-changes-fix'Junio C Hamano2018-08-021-0/+10
|\ \ \
| * | | has_uncommitted_changes(): fall back to empty treeJeff King2018-07-111-0/+10
| * | | Merge branch 'nd/ita-wt-renames-in-status' into maintJunio C Hamano2018-02-271-30/+53
| |\ \ \
* | \ \ \ Merge branch 'sb/object-store-grafts'Junio C Hamano2018-07-181-4/+4
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| |
| * | | path.c: migrate global git_path_* to take a repository argumentStefan Beller2018-05-181-4/+4
* | | | Merge branch 'bc/object-id'Junio C Hamano2018-05-301-2/+2
|\ \ \ \
| * | | | wt-status: convert two uses of EMPTY_TREE_SHA1_HEXbrian m. carlson2018-05-021-2/+2
| |/ / /
* | | | Merge branch 'bp/status-rename-config'Junio C Hamano2018-05-301-0/+12
|\ \ \ \
| * | | | add status config and command line options for rename detectionBen Peart2018-05-131-0/+12
* | | | | Merge branch 'js/use-bug-macro'Junio C Hamano2018-05-301-10/+10
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Replace all die("BUG: ...") calls by BUG() onesJohannes Schindelin2018-05-061-10/+10
| |/ / /
View Lorry Controller Status