summaryrefslogtreecommitdiff
path: root/wt-status.c
Commit message (Expand)AuthorAgeFilesLines
* 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
|\
| * wt-status: simplify by using for_each_string_list_itemsb/wt-status-cleanupStefan Beller2017-03-171-15/+5
* | Merge branch 'mg/status-porcelain-no-i18n'Junio C Hamano2017-03-171-4/+4
|\ \
| * | git-status: make porcelain more robustmg/status-porcelain-no-i18nMichael J Gruber2017-03-141-4/+4
* | | wt-status: convert to struct object_idbrian m. carlson2017-02-221-22/+22
* | | refs: convert each_reflog_ent_fn to struct object_idbrian m. carlson2017-02-221-3/+3
* | | Convert remaining callers of resolve_refdup to object_idbrian m. carlson2017-02-221-2/+2
| |/ |/|
* | Merge branch 'rs/object-id'Junio C Hamano2017-02-031-2/+2
|\ \
| * | use oidcpy() for copying hashes between instances of struct object_idRené Scharfe2017-01-301-2/+2
* | | Merge branch 'js/status-pre-rebase-i'Junio C Hamano2017-02-021-4/+10
|\ \ \ | |/ / |/| |
| * | status: be prepared for not-yet-started interactive rebasejs/status-pre-rebase-iJohannes Schindelin2017-01-261-4/+10
| |/
* | wt-status: implement opportunisitc index update correctlyJunio C Hamano2016-12-071-3/+4
* | Merge branch 'nd/ita-empty-commit'Junio C Hamano2016-10-271-1/+6
|\ \
| * | diff-lib: allow ita entries treated as "not yet exist in index"Nguyễn Thái Ngọc Duy2016-10-241-1/+6
* | | Merge branch 'js/libify-require-clean-work-tree'Junio C Hamano2016-10-261-0/+78
|\ \ \
| * | | wt-status: begin error messages with lower-casejs/libify-require-clean-work-treeJohannes Schindelin2016-10-071-3/+3
| * | | wt-status: teach has_{unstaged,uncommitted}_changes() about submodulesJohannes Schindelin2016-10-071-7/+9
| * | | wt-status: export also the has_un{staged,committed}_changes() functionsJohannes Schindelin2016-10-071-2/+2
| * | | wt-status: make the require_clean_work_tree() function reusableJohannes Schindelin2016-10-071-0/+76
* | | | Merge branch 'rs/cocci'Junio C Hamano2016-10-171-6/+4
|\ \ \ \ | | |_|/ | |/| |
| * | | use strbuf_add_unique_abbrev() for adding short hashes, part 3René Scharfe2016-10-101-6/+4
* | | | Merge branch 'rs/cocci'Junio C Hamano2016-10-061-2/+1
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | use strbuf_add_unique_abbrev() for adding short hashes, part 2René Scharfe2016-09-271-2/+1
* | | Merge branch 'rs/cocci'Junio C Hamano2016-09-261-3/+3
|\ \ \ | |/ /
| * | use strbuf_addstr() for adding constant strings to a strbuf, part 2René Scharfe2016-09-151-3/+3
* | | Merge branch 'bc/object-id'Junio C Hamano2016-09-191-2/+2
|\ \ \ | |/ / | | / | |/ |/|
* | Merge branch 'jh/status-v2-porcelain'Junio C Hamano2016-09-081-59/+511
|\ \ | |/ |/|
| * status: print branch info with --porcelain=v2 --branchJeff Hostetler2016-08-111-0/+90
| * status: print per-file porcelain v2 status dataJeff Hostetler2016-08-111-1/+284