Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'ah/usage-strings' | Junio C Hamano | 2015-02-11 | 1 | -2/+2 |
|\ | |||||
| * | standardize usage info string format | Alex Henrie | 2015-01-14 | 1 | -2/+2 |
* | | Merge branch 'jk/blame-commit-label' | Junio C Hamano | 2015-02-11 | 1 | -9/+3 |
|\ \ | |/ |/| | |||||
| * | builtin/commit.c: use xstrdup_or_null instead of envdup | Jeff King | 2015-01-13 | 1 | -9/+3 |
* | | Merge branch 'jk/commit-date-approxidate' | Junio C Hamano | 2014-12-22 | 1 | -30/+18 |
|\ \ | |||||
| * | | commit: always populate GIT_AUTHOR_* variablesjk/commit-date-approxidate | Jeff King | 2014-12-11 | 1 | -21/+5 |
| * | | commit: loosen ident checks when generating template | Jeff King | 2014-12-11 | 1 | -9/+14 |
* | | | Merge branch 'cc/interpret-trailers-more' | Junio C Hamano | 2014-12-22 | 1 | -26/+2 |
|\ \ \ | |||||
| * | | | commit: make ignore_non_trailer() non static | Christian Couder | 2014-11-10 | 1 | -46/+0 |
| * | | | Merge branch 'jc/conflict-hint' into cc/interpret-trailers-more | Junio C Hamano | 2014-11-10 | 1 | -26/+48 |
| |\ \ \ | |||||
| | * | | | merge & sequencer: turn "Conflicts:" hint into a commentjc/conflict-hint | Junio C Hamano | 2014-10-28 | 1 | -16/+31 |
| | * | | | builtin/commit.c: extract ignore_non_trailer() helper function | Junio C Hamano | 2014-10-28 | 1 | -26/+33 |
* | | | | | Merge branch 'rs/ref-transaction' | Junio C Hamano | 2014-10-21 | 1 | -3/+3 |
|\ \ \ \ \ | |||||
| * | | | | | refs.c: change resolve_ref_unsafe reading argument to be a flags field | Ronnie Sahlberg | 2014-10-15 | 1 | -1/+1 |
| * | | | | | refs.c: pass the ref log message to _create/delete/update instead of _commit | Ronnie Sahlberg | 2014-10-15 | 1 | -2/+2 |
* | | | | | | Merge branch 'jn/parse-config-slot' | Junio C Hamano | 2014-10-20 | 1 | -12/+10 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | color_parse: do not mention variable name in error messagejn/parse-config-slot | Jeff King | 2014-10-14 | 1 | -2/+1 |
| * | | | | | pass config slots as pointers instead of offsets | Jonathan Nieder | 2014-10-14 | 1 | -10/+9 |
* | | | | | | Merge branch 'rs/more-uses-of-skip-prefix' | Junio C Hamano | 2014-10-14 | 1 | -9/+9 |
|\ \ \ \ \ \ | |||||
| * | | | | | | use skip_prefix() to avoid more magic numbersrs/more-uses-of-skip-prefix | René Scharfe | 2014-10-07 | 1 | -9/+9 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | lockfile.h: extract new header file for the functions in lockfile.cmh/lockfile | Michael Haggerty | 2014-10-01 | 1 | -0/+1 |
* | | | | | | lockfile: change lock_file::filename into a strbuf | Michael Haggerty | 2014-10-01 | 1 | -6/+6 |
* | | | | | | prepare_index(): declare return value to be (const char *) | Michael Haggerty | 2014-10-01 | 1 | -2/+2 |
|/ / / / / | |||||
* | | | | | Merge branch 'ah/grammofix' | Junio C Hamano | 2014-09-19 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | grammofix in user-facing messagesah/grammofix | Alex Henrie | 2014-09-02 | 1 | -1/+1 |
| |/ / / / | |||||
* | | | | | Merge branch 'jk/commit-author-parsing' | Junio C Hamano | 2014-09-19 | 1 | -41/+48 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | determine_author_info(): copy getenv outputjk/commit-author-parsing | Jeff King | 2014-08-29 | 1 | -13/+27 |
| * | | | | determine_author_info(): reuse parsing functions | Jeff King | 2014-08-29 | 1 | -28/+21 |
| * | | | | date: use strbufs in date-formatting functions | Jeff King | 2014-08-27 | 1 | -10/+10 |
| |/ / / | |||||
* | | | | Merge branch 'dt/cache-tree-repair' | Junio C Hamano | 2014-09-11 | 1 | -1/+13 |
|\ \ \ \ | |||||
| * | | | | cache-tree: Write updated cache-tree after commit | David Turner | 2014-07-14 | 1 | -1/+17 |
* | | | | | Merge branch 'rs/ref-transaction-1' | Junio C Hamano | 2014-09-11 | 1 | -13/+12 |
|\ \ \ \ \ | |||||
| * | | | | | commit.c: use ref transactions for updates | Ronnie Sahlberg | 2014-09-03 | 1 | -13/+12 |
* | | | | | | Merge branch 'rs/child-process-init' | Junio C Hamano | 2014-09-11 | 1 | -2/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | run-command: introduce CHILD_PROCESS_INIT | René Scharfe | 2014-08-20 | 1 | -2/+1 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge branch 'sb/prepare-revision-walk-error-check' | Junio C Hamano | 2014-09-09 | 1 | -1/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | prepare_revision_walk(): check for return value in all placessb/prepare-revision-walk-error-check | Stefan Beller | 2014-08-12 | 1 | -1/+2 |
* | | | | | | | Merge branch 'mm/config-edit-global' | Junio C Hamano | 2014-09-02 | 1 | -2/+33 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | commit: advertise config --global --edit on guessed identitymm/config-edit-global | Matthieu Moy | 2014-07-25 | 1 | -2/+33 |
| |/ / / / / | |||||
| * | | | | | Merge branch 'jk/commit-buffer-length' into maint | Junio C Hamano | 2014-07-16 | 1 | -2/+2 |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | Merge branch 'jl/status-added-submodule-is-never-ignored' into maint | Junio C Hamano | 2014-06-25 | 1 | -2/+16 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'jk/commit-C-pick-empty' into maint | Junio C Hamano | 2014-06-25 | 1 | -3/+2 |
| |\ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ | Merge branch 'ta/string-list-init' | Junio C Hamano | 2014-07-23 | 1 | -2/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | replace memset with string-list initializersta/string-list-init | Tanay Abhra | 2014-07-21 | 1 | -2/+1 |
* | | | | | | | | | Merge branch 'rs/code-cleaning' | Junio C Hamano | 2014-07-22 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | strbuf: use strbuf_addstr() for adding C strings | René Scharfe | 2014-07-17 | 1 | -1/+1 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'nd/split-index' | Junio C Hamano | 2014-07-16 | 1 | -19/+14 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | read-cache: new API write_locked_index instead of write_index/write_cache | Nguyễn Thái Ngọc Duy | 2014-06-13 | 1 | -19/+14 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'jk/skip-prefix' | Junio C Hamano | 2014-07-09 | 1 | -3/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | refactor skip_prefix to return a boolean | Jeff King | 2014-06-20 | 1 | -3/+2 |
| | |_|_|_|/ / / | |/| | | | | | |