summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'nd/ita-empty-commit'Junio C Hamano2016-10-279-13/+89
|\
| * commit: don't be fooled by ita entries when creating initial commitnd/ita-empty-commitNguyễn Thái Ngọc Duy2016-10-242-3/+18
| * commit: fix empty commit creation when there's no changes but ita entriesNguyễn Thái Ngọc Duy2016-10-245-5/+18
| * diff: add --ita-[in]visible-in-indexNguyễn Thái Ngọc Duy2016-10-243-1/+15
| * diff-lib: allow ita entries treated as "not yet exist in index"Nguyễn Thái Ngọc Duy2016-10-245-4/+38
* | Merge branch 'js/prepare-sequencer'Junio C Hamano2016-10-275-261/+492
|\ \
| * | sequencer: mark all error messages for translationJohannes Schindelin2016-10-211-10/+16
| * | sequencer: start error messages consistently with lower caseJohannes Schindelin2016-10-212-35/+35
| * | sequencer: quote filenames in error messagesJohannes Schindelin2016-10-211-11/+11
| * | sequencer: mark action_name() for translationJohannes Schindelin2016-10-211-7/+7
| * | sequencer: remove overzealous assumption in rebase -i modeJohannes Schindelin2016-10-211-3/+4
| * | sequencer: teach write_message() to append an optional LFJohannes Schindelin2016-10-211-3/+8
| * | sequencer: refactor write_message() to take a pointer/lengthJohannes Schindelin2016-10-211-4/+6
| * | sequencer: roll back lock file if write_message() failedJohannes Schindelin2016-10-211-3/+7
| * | sequencer: stop releasing the strbuf in write_message()Johannes Schindelin2016-10-211-1/+1
| * | sequencer: left-trim lines read from the scriptJohannes Schindelin2016-10-211-0/+3
| * | sequencer: support cleaning up commit messagesJohannes Schindelin2016-10-211-3/+7
| * | sequencer: support amending commitsJohannes Schindelin2016-10-211-2/+4
| * | sequencer: allow editing the commit message on a case-by-case basisJohannes Schindelin2016-10-211-8/+40
| * | sequencer: introduce a helper to read files written by scriptsJohannes Schindelin2016-10-211-0/+34
| * | sequencer: prepare for rebase -i's commit functionalityJohannes Schindelin2016-10-211-10/+89
| * | sequencer: remember the onelines when parsing the todo fileJohannes Schindelin2016-10-211-0/+7
| * | sequencer: get rid of the subcommand fieldJohannes Schindelin2016-10-213-53/+31
| * | sequencer: avoid completely different messages for different actionsJohannes Schindelin2016-10-211-5/+2
| * | sequencer: strip CR from the todo scriptJohannes Schindelin2016-10-211-0/+3
| * | sequencer: completely revamp the "todo" script parsingJohannes Schindelin2016-10-211-121/+163
| * | sequencer: refactor the code to obtain a short commit nameJohannes Schindelin2016-10-211-3/+7
| * | sequencer: future-proof read_populate_todo()Johannes Schindelin2016-10-211-7/+11
| * | sequencer: plug memory leaks for the option valuesJohannes Schindelin2016-10-213-7/+29
| * | sequencer: future-proof remove_sequencer_state()Johannes Schindelin2016-10-171-8/+13
| * | sequencer: avoid unnecessary indirectionJohannes Schindelin2016-10-171-3/+3
| * | sequencer: use memoized sequencer directory pathJohannes Schindelin2016-10-173-10/+8
| * | sequencer: use static initializers for replay_optsJohannes Schindelin2016-10-172-4/+3
* | | Merge branch 'jk/daemon-path-ok-check-truncation'Junio C Hamano2016-10-271-4/+21
|\ \ \
| * | | daemon: detect and reject too-long pathsjk/daemon-path-ok-check-truncationJeff King2016-10-241-4/+21
* | | | Merge branch 'rs/ring-buffer-wraparound'Junio C Hamano2016-10-272-2/+4
|\ \ \ \
| * | | | hex: make wraparound of the index into ring-buffer explicitrs/ring-buffer-wraparoundRené Scharfe2016-10-262-2/+4
* | | | | Merge branch 'sb/submodule-ignore-trailing-slash'Junio C Hamano2016-10-272-15/+22
|\ \ \ \ \
| * | | | | t0060: sidestep surprising path mangling results on Windowssb/submodule-ignore-trailing-slashJohannes Sixt2016-10-251-13/+14
| * | | | | submodule: ignore trailing slash in relative urlStefan Beller2016-10-102-0/+3
| * | | | | submodule: ignore trailing slash on superproject URLStefan Beller2016-10-102-2/+5
* | | | | | Merge branch 'jk/no-looking-at-dotgit-outside-repo'Junio C Hamano2016-10-2711-46/+66
|\ \ \ \ \ \
| * | | | | | diff: handle sha1 abbreviations outside of repositoryJeff King2016-10-261-4/+17
| * | | | | | diff_aligned_abbrev: use "struct oid"Jeff King2016-10-263-12/+14
| * | | | | | diff_unique_abbrev: rename to diff_aligned_abbrevJeff King2016-10-263-11/+11
| * | | | | | find_unique_abbrev: use 4-buffer ringJeff King2016-10-264-19/+16
| * | | | | | test-*-cache-tree: setup git dirJeff King2016-10-262-0/+2
| * | | | | | read info/{attributes,exclude} only when in repositoryJeff King2016-10-262-7/+11
* | | | | | | Merge branch 'jc/abbrev-auto'Junio C Hamano2016-10-273-42/+81
|\ \ \ \ \ \ \
| * | | | | | | transport: compute summary-width dynamicallyjc/abbrev-autoJunio C Hamano2016-10-221-1/+17
View Lorry Controller Status