summaryrefslogtreecommitdiff
path: root/wt-status.c
AgeCommit message (Expand)AuthorFilesLines
2018-11-13status: rebase and merge can be in progress at the same timeLibravatar Johannes Schindelin1-2/+7
2018-10-19Merge branch 'ss/wt-status-committable'Libravatar Junio C Hamano1-89/+82
2018-10-19Merge branch 'nd/the-index'Libravatar Junio C Hamano1-5/+5
2018-10-03roll wt_status_state into wt_status and populate in the collect phaseLibravatar Stephen P. Smith1-75/+59
2018-09-21revision.c: remove implicit dependency on the_indexLibravatar Nguyễn Thái Ngọc Duy1-5/+5
2018-09-07wt-status.c: set the committable flag in the collect phaseLibravatar Stephen P. Smith1-2/+11
2018-09-07wt-status: rename commitable to committableLibravatar Stephen P. Smith1-5/+5
2018-09-07wt-status.c: move has_unmerged earlier in the fileLibravatar Stephen P. Smith1-13/+13
2018-08-29convert "oidcmp() == 0" to oideq()Libravatar Jeff King1-5/+5
2018-08-13dir.c: remove an implicit dependency on the_index in pathspec codeLibravatar Nguyễn Thái Ngọc Duy1-3/+3
2018-08-02Merge branch 'sb/object-store-lookup'Libravatar Junio C Hamano1-2/+2
2018-08-02Merge branch 'jk/has-uncommitted-changes-fix'Libravatar Junio C Hamano1-0/+10
2018-07-18Merge branch 'sb/object-store-grafts'Libravatar Junio C Hamano1-4/+4
2018-07-11has_uncommitted_changes(): fall back to empty treeLibravatar Jeff King1-0/+10
2018-06-29commit: add repository argument to lookup_commit_reference_gentlyLibravatar Stefan Beller1-1/+1
2018-06-29Merge branch 'sb/object-store-grafts' into sb/object-store-lookupLibravatar Junio C Hamano1-4/+4
2018-05-30Merge branch 'bc/object-id'Libravatar Junio C Hamano1-2/+2
2018-05-30Merge branch 'bp/status-rename-config'Libravatar Junio C Hamano1-0/+12
2018-05-30Merge branch 'js/use-bug-macro'Libravatar Junio C Hamano1-10/+10
2018-05-18path.c: migrate global git_path_* to take a repository argumentLibravatar Stefan Beller1-4/+4
2018-05-13add status config and command line options for rename detectionLibravatar Ben Peart1-0/+12
2018-05-06Replace all die("BUG: ...") calls by BUG() onesLibravatar Johannes Schindelin1-10/+10
2018-05-06wt-status: use settings from git_diff_ui_configLibravatar Eckhard S. Maaß1-4/+0
2018-05-02wt-status: convert two uses of EMPTY_TREE_SHA1_HEXLibravatar brian m. carlson1-2/+2
2018-03-14Convert find_unique_abbrev* to struct object_idLibravatar brian m. carlson1-3/+3
2018-03-14wt-status: convert struct wt_status_state to object_idLibravatar brian m. carlson1-6/+6
2018-03-14strbuf: convert strbuf_add_unique_abbrev to use struct object_idLibravatar brian m. carlson1-3/+3
2018-03-08Merge branch 'jh/status-no-ahead-behind'Libravatar Junio C Hamano1-12/+29
2018-02-27Merge branch 'nd/ita-wt-renames-in-status' into maintLibravatar Junio C Hamano1-30/+53
2018-01-24status: support --no-ahead-behind in long formatLibravatar Jeff Hostetler1-1/+1
2018-01-24status: update short status to respect --no-ahead-behindLibravatar Jeff Hostetler1-4/+7
2018-01-24status: add --[no-]ahead-behind to status and commit for V2 format.Libravatar Jeff Hostetler1-9/+21
2018-01-24stat_tracking_info: return +1 when branches not equalLibravatar Jeff Hostetler1-2/+4
2018-01-23Merge branch 'nd/ita-wt-renames-in-status'Libravatar Junio C Hamano1-30/+53
2017-12-27wt-status.c: handle worktree renamesLibravatar Nguyễn Thái Ngọc Duy1-3/+19
2017-12-27wt-status.c: rename rename-related fields in wt_status_change_dataLibravatar Nguyễn Thái Ngọc Duy1-24/+26
2017-12-27wt-status.c: catch unhandled diff status codesLibravatar Nguyễn Thái Ngọc Duy1-2/+6
2017-12-27wt-status.c: coding style fixLibravatar Nguyễn Thái Ngọc Duy1-1/+2
2017-12-27Use DIFF_DETECT_RENAME for detect_rename assignmentsLibravatar Nguyễn Thái Ngọc Duy1-2/+2
2017-11-15Merge branch 'bw/rebase-i-ignored-submodule-fix'Libravatar Junio C Hamano1-1/+3
2017-11-13Merge branch 'jm/status-ignored-files-list'Libravatar Junio C Hamano1-3/+8
2017-11-09Merge branch 'bw/diff-opt-impl-to-bitfields'Libravatar Junio C Hamano1-9/+9
2017-11-07wt-status: actually ignore submodules when requestedLibravatar Brandon Williams1-1/+3
2017-11-06Merge branch 'bc/object-id'Libravatar Junio C Hamano1-1/+1
2017-11-06Merge branch 'ma/lockfile-fixes'Libravatar Junio C Hamano1-4/+4
2017-11-01diff: make struct diff_flags members lowercaseLibravatar Brandon Williams1-9/+9
2017-11-01diff: remove DIFF_OPT_SET macroLibravatar Brandon Williams1-9/+9
2017-10-31status: add option to show ignored files differentlyLibravatar Jameson Miller1-3/+8
2017-10-16refs: convert dwim_ref and expand_ref to struct object_idLibravatar brian m. carlson1-1/+1
2017-10-06treewide: prefer lockfiles on the stackLibravatar Martin Ågren1-4/+4