Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'nd/the-index' | Junio C Hamano | 2019-01-04 | 1 | -2/+2 |
|\ | |||||
| * | rerere.c: remove the_repository references | Nguyễn Thái Ngọc Duy | 2018-11-12 | 1 | -1/+1 |
| * | branch.c: remove the_repository reference | Nguyễn Thái Ngọc Duy | 2018-11-12 | 1 | -1/+1 |
* | | Merge branch 'jk/unused-parameter-fixes' | Junio C Hamano | 2018-11-18 | 1 | -1/+3 |
|\ \ | |||||
| * | | am: handle --no-patch-format option | Jeff King | 2018-11-06 | 1 | -1/+3 |
| |/ | |||||
* | | Merge branch 'pw/am-rebase-read-author-script' | Junio C Hamano | 2018-11-13 | 1 | -56/+4 |
|\ \ | |/ |/| | |||||
| * | add read_author_script() to libgit | Phillip Wood | 2018-11-01 | 1 | -84/+2 |
| * | am: rename read_author_script() | Phillip Wood | 2018-11-01 | 1 | -2/+2 |
| * | am: improve author-script error reporting | Phillip Wood | 2018-11-01 | 1 | -10/+39 |
| * | am: don't die in read_author_script() | Phillip Wood | 2018-11-01 | 1 | -1/+2 |
* | | Merge branch 'nd/status-refresh-progress' | Junio C Hamano | 2018-10-19 | 1 | -1/+1 |
|\ \ | |||||
| * | | status: show progress bar if refreshing the index takes too long | Nguyễn Thái Ngọc Duy | 2018-09-17 | 1 | -1/+1 |
* | | | Merge branch 'nd/the-index' | Junio C Hamano | 2018-10-19 | 1 | -5/+5 |
|\ \ \ | |_|/ |/| | | |||||
| * | | revision.c: remove implicit dependency on the_index | Nguyễn Thái Ngọc Duy | 2018-09-21 | 1 | -3/+3 |
| * | | rerere.c: remove implicit dependency on the_index | Nguyễn Thái Ngọc Duy | 2018-09-21 | 1 | -2/+2 |
| |/ | |||||
* | | Merge branch 'rs/mailinfo-format-flowed' | Junio C Hamano | 2018-09-17 | 1 | -0/+4 |
|\ \ | |||||
| * | | mailinfo: support format=flowed | René Scharfe | 2018-08-29 | 1 | -0/+4 |
* | | | Merge branch 'jk/cocci' | Junio C Hamano | 2018-09-17 | 1 | -1/+1 |
|\ \ \ | |_|/ |/| | | |||||
| * | | convert "oidcmp() == 0" to oideq() | Jeff King | 2018-08-29 | 1 | -1/+1 |
* | | | Merge branch 'en/directory-renames-nothanks' | Junio C Hamano | 2018-09-04 | 1 | -0/+1 |
|\ \ \ | |/ / |/| | | |||||
| * | | am: avoid directory rename detection when calling recursive merge machinery | Elijah Newren | 2018-08-30 | 1 | -0/+1 |
| |/ | |||||
* | | apply.c: make init_apply_state() take a struct repository | Nguyễn Thái Ngọc Duy | 2018-08-13 | 1 | -1/+1 |
* | | Merge branch 'en/dirty-merge-fixes' | Junio C Hamano | 2018-08-03 | 1 | -3/+4 |
|\ \ | |||||
| * | | merge-recursive: fix assumption that head tree being merged is HEAD | Elijah Newren | 2018-07-11 | 1 | -3/+4 |
| * | | index_has_changes(): avoid assuming operating on the_index | Elijah Newren | 2018-07-03 | 1 | -3/+3 |
* | | | commit: add repository argument to lookup_commit | Stefan Beller | 2018-06-29 | 1 | -1/+2 |
* | | | tree: add repository argument to lookup_tree | Stefan Beller | 2018-06-29 | 1 | -2/+4 |
* | | | Merge branch 'nd/complete-config-vars' | Junio C Hamano | 2018-06-25 | 1 | -5/+1 |
|\ \ \ | |_|/ |/| | | |||||
| * | | am: move advice.amWorkDir parsing back to advice.c | Nguyễn Thái Ngọc Duy | 2018-05-29 | 1 | -5/+1 |
* | | | Merge branch 'nd/use-opt-int-set-f' | Junio C Hamano | 2018-06-01 | 1 | -6/+6 |
|\ \ \ | |||||
| * | | | Use OPT_SET_INT_F() for cmdline option specification | Nguyễn Thái Ngọc Duy | 2018-05-24 | 1 | -6/+6 |
| |/ / | |||||
* | | | Merge branch 'bc/object-id' | Junio C Hamano | 2018-05-30 | 1 | -4/+4 |
|\ \ \ | |||||
| * | | | builtin/am: convert uses of EMPTY_TREE_SHA1_BIN to the_hash_algo | brian m. carlson | 2018-05-02 | 1 | -4/+4 |
* | | | | Replace all die("BUG: ...") calls by BUG() ones | Johannes Schindelin | 2018-05-06 | 1 | -10/+10 |
| |/ / |/| | | |||||
* | | | exec_cmd: rename to use dash in file name | Stefan Beller | 2018-04-11 | 1 | -1/+1 |
|/ / | |||||
* | | Merge branch 'sb/object-store' | Junio C Hamano | 2018-04-11 | 1 | -1/+1 |
|\ \ | |||||
| * | | object-store: close all packs upon clearing the object store | Stefan Beller | 2018-03-26 | 1 | -1/+1 |
* | | | cache-tree: convert write_*_as_tree to object_id | brian m. carlson | 2018-03-14 | 1 | -4/+4 |
| |/ |/| | |||||
* | | Merge branch 'nd/rebase-show-current-patch' | Junio C Hamano | 2018-03-06 | 1 | -4/+43 |
|\ \ | |||||
| * | | rebase: introduce and use pseudo-ref REBASE_HEAD | Nguyễn Thái Ngọc Duy | 2018-02-12 | 1 | -0/+4 |
| * | | rebase: add --show-current-patch | Nguyễn Thái Ngọc Duy | 2018-02-12 | 1 | -0/+11 |
| * | | am: add --show-current-patch | Nguyễn Thái Ngọc Duy | 2018-02-12 | 1 | -4/+28 |
* | | | Merge branch 'nd/am-quit' | Junio C Hamano | 2018-02-28 | 1 | -2/+10 |
|\ \ \ | |||||
| * | | | am: support --quit | Nguyễn Thái Ngọc Duy | 2018-02-14 | 1 | -2/+10 |
| | |/ | |/| | |||||
* | | | Merge branch 'po/object-id' | Junio C Hamano | 2018-02-15 | 1 | -2/+2 |
|\ \ \ | |/ / |/| | | |||||
| * | | commit: convert commit_tree* to object_id | Patryk Obara | 2018-01-30 | 1 | -2/+2 |
| |/ | |||||
* / | sq_quote_argv: drop maxlen parameter | Jeff King | 2018-01-16 | 1 | -1/+1 |
|/ | |||||
* | Merge branch 'ew/empty-merge-with-dirty-index' | Junio C Hamano | 2018-01-05 | 1 | -37/+0 |
|\ | |||||
| * | Merge branch 'ew/empty-merge-with-dirty-index-maint' into ew/empty-merge-with... | Junio C Hamano | 2017-12-22 | 1 | -37/+0 |
| |\ | |||||
| | * | move index_has_changes() from builtin/am.c to merge.c for reuse | Elijah Newren | 2017-12-22 | 1 | -37/+0 |