Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'rs/child-process-init' | Junio C Hamano | 2014-09-11 | 10 | -26/+14 |
|\ | |||||
| * | run-command: introduce CHILD_PROCESS_INIT | René Scharfe | 2014-08-20 | 10 | -26/+14 |
* | | Merge branch 'ta/config-set-2' | Junio C Hamano | 2014-09-11 | 2 | -38/+25 |
|\ \ | |||||
| * | | builtin/apply.c: replace `git_config()` with `git_config_get_string_const()`ta/config-set-2 | Tanay Abhra | 2014-08-13 | 1 | -7/+5 |
| * | | builtin/gc.c: replace `git_config()` with `git_config_get_*()` family | Tanay Abhra | 2014-08-07 | 1 | -31/+20 |
* | | | Merge branch 'rs/clean-menu-item-defn' | Junio C Hamano | 2014-09-09 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | clean: use f(void) instead of f() to declare a pointer to a function without ...rs/clean-menu-item-defn | René Scharfe | 2014-08-18 | 1 | -1/+1 |
* | | | | Merge branch 'sb/mailsplit-dead-code-removal' | Junio C Hamano | 2014-09-09 | 1 | -11/+6 |
|\ \ \ \ | |||||
| * | | | | mailsplit.c: remove dead codesb/mailsplit-dead-code-removal | Stefan Beller | 2014-08-13 | 1 | -11/+6 |
* | | | | | Merge branch 'sb/prepare-revision-walk-error-check' | Junio C Hamano | 2014-09-09 | 2 | -2/+5 |
|\ \ \ \ \ | |||||
| * | | | | | prepare_revision_walk(): check for return value in all placessb/prepare-revision-walk-error-check | Stefan Beller | 2014-08-12 | 2 | -2/+5 |
* | | | | | | Merge branch 'sb/blame-msg-i18n' | Junio C Hamano | 2014-09-09 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | builtin/blame.c: add translation to warning about failed revision walksb/blame-msg-i18n | Stefan Beller | 2014-08-12 | 1 | -1/+1 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'sb/plug-leaks' | Junio C Hamano | 2014-09-09 | 1 | -0/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | clone.c: don't leak memory in cmd_clonesb/plug-leaks | Stefan Beller | 2014-08-10 | 1 | -0/+2 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'mm/log-branch-desc-plug-leak' | Junio C Hamano | 2014-09-09 | 1 | -0/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | builtin/log.c: fix minor memory leakmm/log-branch-desc-plug-leak | Matthieu Moy | 2014-08-07 | 1 | -0/+1 |
* | | | | | | | Merge branch 'jc/apply-ws-prefix' | Junio C Hamano | 2014-09-09 | 1 | -63/+68 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | apply: omit ws check for excluded pathsjc/apply-ws-prefix | Junio C Hamano | 2014-08-07 | 1 | -3/+6 |
| * | | | | | | | apply: hoist use_patch() helper for path exclusion up | Junio C Hamano | 2014-08-07 | 1 | -38/+43 |
| * | | | | | | | apply: use the right attribute for paths in non-Git patches | Junio C Hamano | 2014-08-07 | 1 | -22/+19 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'rs/strbuf-getcwd' | Junio C Hamano | 2014-09-02 | 2 | -16/+14 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | use xgetcwd() to set $GIT_DIR | René Scharfe | 2014-08-26 | 1 | -4/+3 |
| * | | | | | | | use xgetcwd() to get the current directory or die | René Scharfe | 2014-08-26 | 2 | -12/+11 |
* | | | | | | | | Merge branch 'rs/init-no-duplicate-real-path' | Junio C Hamano | 2014-09-02 | 1 | -4/+4 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | init: avoid superfluous real_path() callsrs/init-no-duplicate-real-path | René Scharfe | 2014-07-28 | 1 | -4/+4 |
| | |_|/ / / / / | |/| | | | | | | |||||
| * | | | | | | | diff-tree: avoid lookup_unknown_objectjk/alloc-commit-id-maint | Jeff King | 2014-07-28 | 1 | -3/+1 |
| * | | | | | | | move setting of object->type to alloc_* functions | Jeff King | 2014-07-28 | 1 | -1/+0 |
* | | | | | | | | Merge branch 'mm/config-edit-global' | Junio C Hamano | 2014-09-02 | 2 | -5/+61 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | commit: advertise config --global --edit on guessed identitymm/config-edit-global | Matthieu Moy | 2014-07-25 | 1 | -2/+33 |
| * | | | | | | | | config --global --edit: create a template file if needed | Matthieu Moy | 2014-07-25 | 1 | -3/+28 |
| |/ / / / / / / | |||||
| * | | | | | | | Merge branch 'bg/xcalloc-nmemb-then-size' into maint | Junio C Hamano | 2014-07-22 | 2 | -5/+5 |
| |\ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ | Merge branch 'jk/pack-shallow-always-without-bitmap' | Junio C Hamano | 2014-08-26 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | |||||
| * | | | | | | | | pack-objects: turn off bitmaps when we see --shallow linesjk/pack-shallow-always-without-bitmap | Jeff King | 2014-08-12 | 1 | -0/+1 |
* | | | | | | | | | 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 |