Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge branch 'jk/commit-buffer-length' | Junio C Hamano | 2014-07-02 | 1 | -2/+2 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | / | | |_|_|/ | |/| | | | |||||
| * | | | | commit_tree: take a pointer/len pair rather than a const strbuf | Jeff King | 2014-06-12 | 1 | -2/+2 |
| |/ / / | |||||
* | | | | Merge branch 'jl/status-added-submodule-is-never-ignored' | Junio C Hamano | 2014-06-16 | 1 | -2/+16 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | commit -m: commit staged submodules regardless of ignore configjl/status-added-submodule-is-never-ignored | Jens Lehmann | 2014-04-07 | 1 | -2/+16 |
* | | | | Merge branch 'nd/status-auto-comment-char' | Junio C Hamano | 2014-06-06 | 1 | -0/+32 |
|\ \ \ \ | |||||
| * | | | | commit: allow core.commentChar=auto for character auto selectionnd/status-auto-comment-char | Nguyễn Thái Ngọc Duy | 2014-05-19 | 1 | -0/+32 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'fc/status-printf-squelch-format-zero-length-warnings' | Junio C Hamano | 2014-06-06 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | silence a bunch of format-zero-length warningsfc/status-printf-squelch-format-zero-length-warnings | Felipe Contreras | 2014-05-07 | 1 | -1/+1 |
* | | | | | Merge branch 'jk/commit-C-pick-empty' | Junio C Hamano | 2014-06-06 | 1 | -3/+2 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | commit: do not complain of empty messages from -Cjk/commit-C-pick-empty | Jeff King | 2014-04-28 | 1 | -3/+2 |
| |/ / / | |||||
* | | | | Merge branch 'jk/commit-date-approxidate' | Junio C Hamano | 2014-06-03 | 1 | -19/+60 |
|\ \ \ \ | |||||
| * | | | | commit: accept more date formats for "--date" | Jeff King | 2014-05-02 | 1 | -2/+25 |
| * | | | | commit: print "Date" line when the user has set date | Jeff King | 2014-05-02 | 1 | -0/+19 |
| * | | | | commit: use split_ident_line to compare author/committer | Jeff King | 2014-05-02 | 1 | -17/+16 |
| | |/ / | |/| | | |||||
* | | | | commit.c: check for lock error and return earlyrs/ref-update-check-errors-early | Ronnie Sahlberg | 2014-04-17 | 1 | -4/+4 |
|/ / / | |||||
* | | | Merge branch 'jl/nor-or-nand-and' | Junio C Hamano | 2014-04-08 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | code and test: fix misuses of "nor"jl/nor-or-nand-and | Justin Lebar | 2014-03-31 | 1 | -1/+1 |
* | | | | Merge branch 'jc/rev-parse-argh-dashed-multi-words' | Junio C Hamano | 2014-04-08 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | parse-options: multi-word argh should use dash to separate words | Junio C Hamano | 2014-03-24 | 1 | -1/+1 |
* | | | | | Merge branch 'bp/commit-p-editor' | Junio C Hamano | 2014-03-28 | 1 | -7/+28 |
|\ \ \ \ \ | |||||
| * | | | | | commit: fix patch hunk editing with "commit -p -m" | Benoit Pierre | 2014-03-18 | 1 | -7/+28 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'nd/commit-editor-cleanup' | Junio C Hamano | 2014-03-25 | 1 | -3/+11 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | commit: add --cleanup=scissorsnd/commit-editor-cleanup | Nguyễn Thái Ngọc Duy | 2014-02-25 | 1 | -3/+11 |
| |/ / / |