summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* i18n: fix unmatched single quote in error messagejs/prepare-sequencerJiang Xin2016-11-211-1/+1
* sequencer: silence -Wtautological-constant-out-of-range-compareJeff King2016-11-081-1/+1
* 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
* Eighth batch for 2.11Junio C Hamano2016-10-061-0/+34
* Merge branch 'sg/ref-filter-parse-optim'Junio C Hamano2016-10-061-11/+11
|\
| * ref-filter: strip format option after a field name only once while parsingsg/ref-filter-parse-optimSZEDER Gábor2016-10-031-11/+11
* | Merge branch 'rs/cocci'Junio C Hamano2016-10-066-6/+41
|\ \
| * | coccicheck: make transformation for strbuf_addf(sb, "...") more preciseRené Scharfe2016-10-031-3/+26
| * | use strbuf_add_unique_abbrev() for adding short hashes, part 2René Scharfe2016-09-274-4/+9
| * | use strbuf_addstr() instead of strbuf_addf() with "%s", part 2René Scharfe2016-09-273-2/+8
| * | gitignore: ignore output files of coccicheck make targetRené Scharfe2016-09-271-0/+1
* | | Merge branch 'rs/c-auto-resets-attributes'Junio C Hamano2016-10-062-2/+2
|\ \ \
| * | | pretty: avoid adding reset for %C(auto) if output is emptyrs/c-auto-resets-attributesRené Scharfe2016-09-292-2/+2
* | | | Merge branch 'ps/http-gssapi-cred-delegation'Junio C Hamano2016-10-062-0/+51
|\ \ \ \
| * | | | http: control GSSAPI credential delegationps/http-gssapi-cred-delegationPetr Stodulka2016-09-292-0/+51
* | | | | Merge branch 'jk/graph-padding-fix'Junio C Hamano2016-10-061-4/+12
|\ \ \ \ \
| * | | | | graph: fix extra spaces in graph_padding_linejk/graph-padding-fixJeff King2016-09-291-4/+12
* | | | | | Merge branch 'jc/blame-abbrev'Junio C Hamano2016-10-061-1/+1
|\ \ \ \ \ \
| * | | | | | blame: use DEFAULT_ABBREV macrojc/blame-abbrevJunio C Hamano2016-09-281-1/+1
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'vn/revision-shorthand-for-side-branch-log'Junio C Hamano2016-10-064-19/+180
|\ \ \ \ \ \
| * | | | | | revision: new rev^-n shorthand for rev^n..revVegard Nossum2016-09-274-19/+180
| |/ / / / /
* | | | | | Merge branch 'jk/ambiguous-short-object-names'Junio C Hamano2016-10-0611-65/+250
|\ \ \ \ \ \
| * | | | | | get_short_sha1: make default disambiguation configurableJeff King2016-09-274-0/+51
| * | | | | | get_short_sha1: list ambiguous objects on errorJeff King2016-09-262-2/+72