aboutsummaryrefslogtreecommitdiff
path: root/wt-status.c
Commit message (Expand)AuthorAge
* Merge branch 'sb/wt-status-cleanup'Junio C Hamano2017-03-21
|\
| * wt-status: simplify by using for_each_string_list_itemStefan Beller2017-03-17
* | Merge branch 'mg/status-porcelain-no-i18n'Junio C Hamano2017-03-17
|\ \
| * | git-status: make porcelain more robustMichael J Gruber2017-03-14
* | | wt-status: convert to struct object_idbrian m. carlson2017-02-22
* | | refs: convert each_reflog_ent_fn to struct object_idbrian m. carlson2017-02-22
* | | Convert remaining callers of resolve_refdup to object_idbrian m. carlson2017-02-22
| |/ |/|
* | Merge branch 'rs/object-id'Junio C Hamano2017-02-03
|\ \
| * | use oidcpy() for copying hashes between instances of struct object_idRené Scharfe2017-01-30
* | | Merge branch 'js/status-pre-rebase-i'Junio C Hamano2017-02-02
|\ \ \ | |/ / |/| |
| * | status: be prepared for not-yet-started interactive rebaseJohannes Schindelin2017-01-26
| |/
* | wt-status: implement opportunisitc index update correctlyJunio C Hamano2016-12-07
* | Merge branch 'nd/ita-empty-commit'Junio C Hamano2016-10-27
|\ \
| * | diff-lib: allow ita entries treated as "not yet exist in index"Nguyễn Thái Ngọc Duy2016-10-24
* | | Merge branch 'js/libify-require-clean-work-tree'Junio C Hamano2016-10-26
|\ \ \
| * | | wt-status: begin error messages with lower-caseJohannes Schindelin2016-10-07
| * | | wt-status: teach has_{unstaged,uncommitted}_changes() about submodulesJohannes Schindelin2016-10-07
| * | | wt-status: export also the has_un{staged,committed}_changes() functionsJohannes Schindelin2016-10-07
| * | | wt-status: make the require_clean_work_tree() function reusableJohannes Schindelin2016-10-07
* | | | Merge branch 'rs/cocci'Junio C Hamano2016-10-17
|\ \ \ \ | | |_|/ | |/| |
| * | | use strbuf_add_unique_abbrev() for adding short hashes, part 3René Scharfe2016-10-10
* | | | Merge branch 'rs/cocci'Junio C Hamano2016-10-06
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | use strbuf_add_unique_abbrev() for adding short hashes, part 2René Scharfe2016-09-27
* | | Merge branch 'rs/cocci'Junio C Hamano2016-09-26
|\ \ \ | |/ /
| * | use strbuf_addstr() for adding constant strings to a strbuf, part 2René Scharfe2016-09-15
* | | Merge branch 'bc/object-id'Junio C Hamano2016-09-19
|\ \ \ | |/ / | | / | |/ |/|
* | Merge branch 'jh/status-v2-porcelain'Junio C Hamano2016-09-08
|\ \ | |/ |/|
| * status: print branch info with --porcelain=v2 --branchJeff Hostetler2016-08-11
| * status: print per-file porcelain v2 status dataJeff Hostetler2016-08-11
| * status: collect per-file data for --porcelain=v2Jeff Hostetler2016-08-11
| * status: cleanup API to wt_status_printJeff Hostetler2016-08-05
| * status: rename long-format print routinesJeff Hostetler2016-08-05
* | Merge branch 'js/am-3-merge-recursive-direct'Junio C Hamano2016-08-10
|\ \
| * | die("bug"): report bugs consistentlyJohannes Schindelin2016-07-26
| |/
* | Merge branch 'mm/status-suggest-merge-abort'Junio C Hamano2016-08-03
|\ \ | |/ |/|
| * status: suggest 'git merge --abort' when appropriateMatthieu Moy2016-07-22
* | Merge branch 'rs/use-strbuf-addbuf'Junio C Hamano2016-07-25
|\ \
| * | use strbuf_addbuf() for appending a strbuf to anotherRené Scharfe2016-07-19
| |/
* | Merge branch 'bc/cocci'Junio C Hamano2016-07-19
|\ \
| * | diff: convert struct diff_filespec to struct object_idbrian m. carlson2016-06-28
* | | Merge branch 'va/i18n-even-more'Junio C Hamano2016-07-13
|\ \ \
| * | | i18n: unmark die messages for translationVasco Almeida2016-06-17
| |/ /
* | | Use "working tree" instead of "working directory" for git statusLars Vogel2016-06-09
|/ /
* | Merge branch 'nd/worktree-various-heads'Junio C Hamano2016-05-23
|\ \
| * | wt-status.c: split bisect detection out of wt_status_get_state()Nguyễn Thái Ngọc Duy2016-04-22
| * | wt-status.c: make wt_status_check_rebase() work on any worktreeNguyễn Thái Ngọc Duy2016-04-22
| * | wt-status.c: split rebase detection out of wt_status_get_state()Nguyễn Thái Ngọc Duy2016-04-22
* | | Merge branch 'ss/commit-dry-run-resolve-merge-to-no-op'Junio C Hamano2016-05-23
|\ \ \ | |/ / |/| |
| * | wt-status.c: set commitable bit if there is a meaningful merge.Stephen P. Smith2016-02-17
* | | Merge branch 'sb/misc-cleanups'Junio C Hamano2016-04-13
|\ \ \