summaryrefslogtreecommitdiff
path: root/wt-status.c
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \
| * | | | refs: convert dwim_ref and expand_ref to struct object_idbrian m. carlson2017-10-161-1/+1
| |/ / /
* | | | Merge branch 'ma/lockfile-fixes'Junio C Hamano2017-11-061-4/+4
|\ \ \ \ | |/ / / |/| | |
| * | | treewide: prefer lockfiles on the stackMartin Ågren2017-10-061-4/+4
* | | | Merge branch 'rs/resolve-ref-optional-result'Junio C Hamano2017-10-051-3/+1
|\ \ \ \ | |/ / / |/| | |
| * | | refs: pass NULL to resolve_refdup() if hash is not neededrs/resolve-ref-optional-resultRené Scharfe2017-10-011-3/+1
* | | | Merge branch 'ks/commit-do-not-touch-cut-line'Junio C Hamano2017-09-251-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | commit-template: change a message to be more intuitiveks/commit-do-not-touch-cut-lineKaartic Sivaraam2017-09-151-1/+1
| |/ /
* | | wt-status: release strbuf after use in wt_longstatus_print_tracking()rs/strbuf-leakfixRene Scharfe2017-09-101-0/+1
* | | wt-status: release strbuf after use in read_rebase_todolist()Rene Scharfe2017-09-071-0/+1
|/ /
* | Merge branch 'rs/wt-status-cleanup'Junio C Hamano2017-07-121-3/+4
|\ \
| * | wt-status: use separate variable for result of shorten_unambiguous_refrs/wt-status-cleanupRené Scharfe2017-07-101-3/+4
| |/
* | Merge branch 'ks/status-initial-commit'Junio C Hamano2017-06-301-2/+5
|\ \
| * | status: contextually notify user about an initial commitks/status-initial-commitKaartic Sivaraam2017-06-211-2/+5
| |/
| * Merge branch 'bm/interpret-trailers-cut-line-is-eom' into maintJunio C Hamano2017-06-051-5/+6
| |\
* | | status: add optional stash count informationLiam Beguin2017-06-181-0/+24
* | | Merge branch 'nd/fopen-errors'Junio C Hamano2017-06-131-1/+2
|\ \ \
| * | | wrapper.c: add and use fopen_or_warn()Nguyễn Thái Ngọc Duy2017-05-261-1/+2
* | | | Merge branch 'bm/interpret-trailers-cut-line-is-eom'Junio C Hamano2017-05-291-5/+6
|\ \ \ \ | | |_|/ | |/| |
| * | | interpret-trailers: honor the cut linebm/interpret-trailers-cut-line-is-eomBrian Malehorn2017-05-181-5/+6
| |/ /
* | | Merge branch 'js/plug-leaks'Junio C Hamano2017-05-291-14/+15
|\ \ \ | | |/ | |/|
| * | split_commit_in_progress(): simplify & fix memory leakJohannes Schindelin2017-05-081-14/+14
| * | status: close file descriptor after reading git-rebase-todoJohannes Schindelin2017-05-081-0/+1
| |/
* | Merge branch 'bc/object-id'Junio C Hamano2017-05-291-1/+1
|\ \
| * | Convert lookup_commit* to struct object_idbrian m. carlson2017-05-081-1/+1
| |/
* | Merge branch 'bw/dir-c-stops-relying-on-the-index'Junio C Hamano2017-05-291-1/+1
|\ \
| * | dir: convert fill_directory to take an indexbw/dir-c-stops-relying-on-the-indexBrandon Williams2017-05-061-1/+1
| |/
* | Merge branch 'js/larger-timestamps'Junio C Hamano2017-05-161-1/+1
|\ \
| * | timestamp_t: a new data type for timestampsJohannes Schindelin2017-04-271-1/+1
| |/
* | status: fix missing newline when comment chars are disabledJeff King2017-04-281-1/+1
|/
* short status: improve reporting for submodule changesStefan Beller2017-03-291-2/+15
* Merge branch 'sb/wt-status-cleanup'Junio C Hamano2017-03-211-15/+5
|\
View Lorry Controller Status