summaryrefslogtreecommitdiff
path: root/wt-status.c
Commit message (Expand)AuthorAgeFilesLines
* 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
| * status: collect per-file data for --porcelain=v2Jeff Hostetler2016-08-111-2/+62
| * status: cleanup API to wt_status_printJeff Hostetler2016-08-051-3/+22
| * status: rename long-format print routinesJeff Hostetler2016-08-051-55/+55
* | Merge branch 'js/am-3-merge-recursive-direct'Junio C Hamano2016-08-101-2/+2
|\ \
| * | die("bug"): report bugs consistentlyJohannes Schindelin2016-07-261-2/+2
| |/
* | Merge branch 'mm/status-suggest-merge-abort'Junio C Hamano2016-08-031-2/+5
|\ \ | |/ |/|
| * status: suggest 'git merge --abort' when appropriatemm/status-suggest-merge-abortMatthieu Moy2016-07-221-2/+5
* | Merge branch 'rs/use-strbuf-addbuf'Junio C Hamano2016-07-251-1/+1
|\ \
| * | use strbuf_addbuf() for appending a strbuf to anotherRené Scharfe2016-07-191-1/+1
| |/
* | Merge branch 'bc/cocci'Junio C Hamano2016-07-191-1/+2
|\ \
| * | diff: convert struct diff_filespec to struct object_idbrian m. carlson2016-06-281-1/+2
* | | Merge branch 'va/i18n-even-more'Junio C Hamano2016-07-131-2/+2
|\ \ \
| * | | i18n: unmark die messages for translationVasco Almeida2016-06-171-2/+2
| |/ /
* | | Use "working tree" instead of "working directory" for git statuslv/status-say-working-tree-not-directoryLars Vogel2016-06-091-1/+1
|/ /
* | Merge branch 'nd/worktree-various-heads'Junio C Hamano2016-05-231-20/+43
|\ \
| * | wt-status.c: split bisect detection out of wt_status_get_state()Nguyễn Thái Ngọc Duy2016-04-221-9/+14
| * | wt-status.c: make wt_status_check_rebase() work on any worktreeNguyễn Thái Ngọc Duy2016-04-221-13/+20
| * | wt-status.c: split rebase detection out of wt_status_get_state()Nguyễn Thái Ngọc Duy2016-04-221-6/+17
* | | Merge branch 'ss/commit-dry-run-resolve-merge-to-no-op'Junio C Hamano2016-05-231-0/+1
|\ \ \ | |/ / |/| |
| * | wt-status.c: set commitable bit if there is a meaningful merge.ss/commit-dry-run-resolve-merge-to-no-opStephen P. Smith2016-02-171-0/+1
* | | Merge branch 'sb/misc-cleanups'Junio C Hamano2016-04-131-3/+1
|\ \ \
| * | | abbrev_sha1_in_line: don't leak memoryStefan Beller2016-04-011-3/+1
* | | | Merge branch 'mg/wt-status-mismarked-i18n'Junio C Hamano2016-03-141-2/+2
|\ \ \ \
| * | | | wt-status: allow "ahead " to be picked up by l10nmg/wt-status-mismarked-i18nMichael J Gruber2016-03-141-2/+2
* | | | | strbuf: introduce strbuf_getline_{lf,nul}()Junio C Hamano2016-01-151-2/+2
| |/ / / |/| | |
* | | | Merge branch 'bc/object-id'Junio C Hamano2015-12-101-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Remove get_object_hash.brian m. carlson2015-11-201-1/+1
| * | | Add several uses of get_object_hash.brian m. carlson2015-11-201-1/+1
View Lorry Controller Status