summaryrefslogtreecommitdiff
path: root/wt-status.c
Commit message (Expand)AuthorAgeFilesLines
* 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
| |/ / /
* | | | wt-status: use settings from git_diff_ui_configEckhard S. Maaß2018-05-061-4/+0
|/ / /
* | | Convert find_unique_abbrev* to struct object_idbrian m. carlson2018-03-141-3/+3
* | | wt-status: convert struct wt_status_state to object_idbrian m. carlson2018-03-141-6/+6
* | | strbuf: convert strbuf_add_unique_abbrev to use struct object_idbrian m. carlson2018-03-141-3/+3
* | | Merge branch 'jh/status-no-ahead-behind'Junio C Hamano2018-03-081-12/+29
|\ \ \
| * | | status: support --no-ahead-behind in long formatjh/status-no-ahead-behindJeff Hostetler2018-01-241-1/+1
| * | | status: update short status to respect --no-ahead-behindJeff Hostetler2018-01-241-4/+7
| * | | status: add --[no-]ahead-behind to status and commit for V2 format.Jeff Hostetler2018-01-241-9/+21
| * | | stat_tracking_info: return +1 when branches not equalJeff Hostetler2018-01-241-2/+4
| |/ /
* | | Merge branch 'nd/ita-wt-renames-in-status'Junio C Hamano2018-01-231-30/+53
|\ \ \ | |/ / |/| / | |/
| * wt-status.c: handle worktree renamesnd/ita-wt-renames-in-statusNguyễn Thái Ngọc Duy2017-12-271-3/+19
| * wt-status.c: rename rename-related fields in wt_status_change_dataNguyễn Thái Ngọc Duy2017-12-271-24/+26
| * wt-status.c: catch unhandled diff status codesNguyễn Thái Ngọc Duy2017-12-271-2/+6
| * wt-status.c: coding style fixNguyễn Thái Ngọc Duy2017-12-271-1/+2
| * Use DIFF_DETECT_RENAME for detect_rename assignmentsNguyễn Thái Ngọc Duy2017-12-271-2/+2
* | Merge branch 'bw/rebase-i-ignored-submodule-fix'Junio C Hamano2017-11-151-1/+3
|\ \
| * | wt-status: actually ignore submodules when requestedbw/status-ignore-submodules-from-configbw/rebase-i-ignored-submodule-fixBrandon Williams2017-11-071-1/+3
* | | Merge branch 'jm/status-ignored-files-list'Junio C Hamano2017-11-131-3/+8
|\ \ \
| * | | status: add option to show ignored files differentlyJameson Miller2017-10-311-3/+8
* | | | Merge branch 'bw/diff-opt-impl-to-bitfields'Junio C Hamano2017-11-091-9/+9
|\ \ \ \
| * | | | diff: make struct diff_flags members lowercasebw/diff-opt-impl-to-bitfieldsBrandon Williams2017-11-011-9/+9
| * | | | diff: remove DIFF_OPT_SET macroBrandon Williams2017-11-011-9/+9
| |/ / /
* | | | Merge branch 'bc/object-id'Junio C Hamano2017-11-061-1/+1
|\ \ \ \
View Lorry Controller Status