Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | run-command: introduce CHILD_PROCESS_INIT | René Scharfe | 2014-08-20 | 10 | -26/+14 |
* | Merge branch 'jk/misc-fixes-maint' | Junio C Hamano | 2014-07-28 | 4 | -3/+5 |
|\ | |||||
| * | apply: avoid possible bogus pointerjk/misc-fixes-maint | Jeff King | 2014-07-24 | 1 | -1/+1 |
| * | free ref string returned by dwim_ref | Jeff King | 2014-07-24 | 2 | -0/+2 |
| * | receive-pack: don't copy "dir" parameter | Jeff King | 2014-07-24 | 1 | -2/+2 |
* | | Merge branch 'cc/replace-graft' | Junio C Hamano | 2014-07-27 | 1 | -1/+125 |
|\ \ | |||||
| * | | replace: check mergetags when using --graft | Christian Couder | 2014-07-21 | 1 | -0/+47 |
| * | | replace: remove signature when using --graft | Christian Couder | 2014-07-21 | 1 | -0/+5 |
| * | | replace: add --graft option | Christian Couder | 2014-07-21 | 1 | -1/+73 |
* | | | 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 'mb/local-clone-after-applying-insteadof' | Junio C Hamano | 2014-07-23 | 1 | -12/+13 |
|\ \ \ \ | |||||
| * | | | | use local cloning if insteadOf makes a local URLmb/local-clone-after-applying-insteadof | Michael Barabanov | 2014-07-17 | 1 | -12/+13 |
* | | | | | Merge branch 'jk/tag-sort' | Junio C Hamano | 2014-07-23 | 1 | -18/+50 |
|\ \ \ \ \ | |||||
| * | | | | | tag: support configuring --sort via .gitconfigjk/tag-sort | Jacob Keller | 2014-07-17 | 1 | -18/+50 |
* | | | | | | Merge branch 'rs/code-cleaning' | Junio C Hamano | 2014-07-22 | 3 | -19/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | use commit_list_count() to count the members of commit_lists | René Scharfe | 2014-07-17 | 2 | -18/+3 |
| * | | | | | | strbuf: use strbuf_addstr() for adding C strings | René Scharfe | 2014-07-17 | 1 | -1/+1 |
* | | | | | | | Merge branch 'jk/alloc-commit-id' | Junio C Hamano | 2014-07-22 | 2 | -4/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | diff-tree: avoid lookup_unknown_objectjk/alloc-commit-id | Jeff King | 2014-07-13 | 1 | -3/+1 |
| * | | | | | | | move setting of object->type to alloc_* functions | Jeff King | 2014-07-13 | 1 | -1/+0 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Merge branch 'kb/perf-trace' | Junio C Hamano | 2014-07-22 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | trace: improve trace performance | Karsten Blees | 2014-07-13 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2014-07-21 | 4 | -11/+4 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | use xmemdupz() to allocate copies of strings given by start and length | René Scharfe | 2014-07-21 | 2 | -7/+2 |
| * | | | | | | | | use xcalloc() to allocate zero-initialized memory | René Scharfe | 2014-07-21 | 2 | -4/+2 |
* | | | | | | | | | Merge branch 'rs/unify-is-branch' | Junio C Hamano | 2014-07-21 | 1 | -5/+0 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | refs.c: add a public is_branch functionrs/unify-is-branch | Ronnie Sahlberg | 2014-07-16 | 1 | -5/+0 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'kb/hashmap-updates' | Junio C Hamano | 2014-07-21 | 1 | -11/+2 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | hashmap: add simplified hashmap_get_from_hash() API | Karsten Blees | 2014-07-07 | 1 | -3/+1 |
| * | | | | | | | | | hashmap: factor out getting a hash code from a SHA1 | Karsten Blees | 2014-07-07 | 1 | -9/+2 |
| | |_|/ / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'rs/ref-transaction-0' | Junio C Hamano | 2014-07-21 | 2 | -11/+14 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | |||||
| * | | | | | | | | refs.c: change ref_transaction_update() to do error checking and return statusrs/ref-transaction-0 | Ronnie Sahlberg | 2014-07-14 | 1 | -5/+7 |
| * | | | | | | | | refs.c: remove the onerr argument to ref_transaction_commit | Ronnie Sahlberg | 2014-07-14 | 1 | -2/+1 |
| * | | | | | | | | update-ref: use err argument to get error from ref_transaction_commit | Ronnie Sahlberg | 2014-07-14 | 1 | -5/+5 |
| * | | | | | | | | refs.c: add an err argument to repack_without_refs | Ronnie Sahlberg | 2014-07-14 | 1 | -2/+3 |
| * | | | | | | | | refs.c: add a strbuf argument to ref_transaction_commit for error logging | Ronnie Sahlberg | 2014-07-14 | 1 | -1/+1 |
| * | | | | | | | | refs.c: ref_transaction_commit should not free the transaction | Ronnie Sahlberg | 2014-07-14 | 1 | -0/+1 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Sync with 2.0.2 | Junio C Hamano | 2014-07-16 | 1 | -7/+5 |
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||||
| * | | | | | | | Merge branch 'jc/fix-clone-single-starting-at-a-tag' into maint | Junio C Hamano | 2014-07-16 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'jk/commit-buffer-length' into maint | Junio C Hamano | 2014-07-16 | 11 | -29/+47 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'maint-1.9' into maint | Junio C Hamano | 2014-07-16 | 1 | -7/+5 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Merge branch 'maint-1.8.5' into maint-1.9 | Junio C Hamano | 2014-07-16 | 2 | -8/+6 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | annotate: use argv_array | René Scharfe | 2014-07-16 | 1 | -7/+5 |
| * | | | | | | | | | | | Merge branch 'jk/repack-pack-keep-objects' into maint | Junio C Hamano | 2014-07-10 | 1 | -5/+9 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'rs/code-cleaning' | Junio C Hamano | 2014-07-16 | 2 | -7/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | merge: simplify merge_trivial() by using commit_list_append() | René Scharfe | 2014-07-10 | 1 | -6/+4 |
| * | | | | | | | | | | | | use strbuf_addbuf for adding strbufs | René Scharfe | 2014-07-10 | 1 | -1/+1 |
* | | | | | | | | | | | | | Merge branch 'jk/skip-prefix' | Junio C Hamano | 2014-07-16 | 1 | -9/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | tag: use skip_prefix instead of magic numbersjk/skip-prefix | Jeff King | 2014-07-10 | 1 | -9/+5 |