summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rs/child-process-init'Junio C Hamano2014-09-1110-26/+14
|\
| * run-command: introduce CHILD_PROCESS_INITRené Scharfe2014-08-2010-26/+14
* | Merge branch 'ta/config-set-2'Junio C Hamano2014-09-112-38/+25
|\ \
| * | builtin/apply.c: replace `git_config()` with `git_config_get_string_const()`ta/config-set-2Tanay Abhra2014-08-131-7/+5
| * | builtin/gc.c: replace `git_config()` with `git_config_get_*()` familyTanay Abhra2014-08-071-31/+20
* | | Merge branch 'rs/clean-menu-item-defn'Junio C Hamano2014-09-091-1/+1
|\ \ \
| * | | clean: use f(void) instead of f() to declare a pointer to a function without ...rs/clean-menu-item-defnRené Scharfe2014-08-181-1/+1
* | | | Merge branch 'sb/mailsplit-dead-code-removal'Junio C Hamano2014-09-091-11/+6
|\ \ \ \
| * | | | mailsplit.c: remove dead codesb/mailsplit-dead-code-removalStefan Beller2014-08-131-11/+6
* | | | | Merge branch 'sb/prepare-revision-walk-error-check'Junio C Hamano2014-09-092-2/+5
|\ \ \ \ \
| * | | | | prepare_revision_walk(): check for return value in all placessb/prepare-revision-walk-error-checkStefan Beller2014-08-122-2/+5
* | | | | | Merge branch 'sb/blame-msg-i18n'Junio C Hamano2014-09-091-1/+1
|\ \ \ \ \ \
| * | | | | | builtin/blame.c: add translation to warning about failed revision walksb/blame-msg-i18nStefan Beller2014-08-121-1/+1
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'sb/plug-leaks'Junio C Hamano2014-09-091-0/+2
|\ \ \ \ \ \
| * | | | | | clone.c: don't leak memory in cmd_clonesb/plug-leaksStefan Beller2014-08-101-0/+2
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'mm/log-branch-desc-plug-leak'Junio C Hamano2014-09-091-0/+1
|\ \ \ \ \ \
| * | | | | | builtin/log.c: fix minor memory leakmm/log-branch-desc-plug-leakMatthieu Moy2014-08-071-0/+1
* | | | | | | Merge branch 'jc/apply-ws-prefix'Junio C Hamano2014-09-091-63/+68
|\ \ \ \ \ \ \
| * | | | | | | apply: omit ws check for excluded pathsjc/apply-ws-prefixJunio C Hamano2014-08-071-3/+6
| * | | | | | | apply: hoist use_patch() helper for path exclusion upJunio C Hamano2014-08-071-38/+43
| * | | | | | | apply: use the right attribute for paths in non-Git patchesJunio C Hamano2014-08-071-22/+19
| |/ / / / / /
* | | | | | | Merge branch 'rs/strbuf-getcwd'Junio C Hamano2014-09-022-16/+14
|\ \ \ \ \ \ \
| * | | | | | | use xgetcwd() to set $GIT_DIRRené Scharfe2014-08-261-4/+3
| * | | | | | | use xgetcwd() to get the current directory or dieRené Scharfe2014-08-262-12/+11
* | | | | | | | Merge branch 'rs/init-no-duplicate-real-path'Junio C Hamano2014-09-021-4/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | init: avoid superfluous real_path() callsrs/init-no-duplicate-real-pathRené Scharfe2014-07-281-4/+4
| | |_|/ / / / / | |/| | | | | |
| * | | | | | | diff-tree: avoid lookup_unknown_objectjk/alloc-commit-id-maintJeff King2014-07-281-3/+1
| * | | | | | | move setting of object->type to alloc_* functionsJeff King2014-07-281-1/+0
* | | | | | | | Merge branch 'mm/config-edit-global'Junio C Hamano2014-09-022-5/+61
|\ \ \ \ \ \ \ \
| * | | | | | | | commit: advertise config --global --edit on guessed identitymm/config-edit-globalMatthieu Moy2014-07-251-2/+33
| * | | | | | | | config --global --edit: create a template file if neededMatthieu Moy2014-07-251-3/+28
| |/ / / / / / /
| * | | | | | | Merge branch 'bg/xcalloc-nmemb-then-size' into maintJunio C Hamano2014-07-222-5/+5
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge branch 'jk/pack-shallow-always-without-bitmap'Junio C Hamano2014-08-261-0/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | pack-objects: turn off bitmaps when we see --shallow linesjk/pack-shallow-always-without-bitmapJeff King2014-08-121-0/+1
* | | | | | | | | Merge branch 'jk/misc-fixes-maint'Junio C Hamano2014-07-284-3/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | apply: avoid possible bogus pointerjk/misc-fixes-maintJeff King2014-07-241-1/+1
| * | | | | | | | | free ref string returned by dwim_refJeff King2014-07-242-0/+2
| * | | | | | | | | receive-pack: don't copy "dir" parameterJeff King2014-07-241-2/+2
* | | | | | | | | | Merge branch 'cc/replace-graft'Junio C Hamano2014-07-271-1/+125
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | replace: check mergetags when using --graftChristian Couder2014-07-211-0/+47
| * | | | | | | | | replace: remove signature when using --graftChristian Couder2014-07-211-0/+5
| * | | | | | | | | replace: add --graft optionChristian Couder2014-07-211-1/+73
* | | | | | | | | | Merge branch 'ta/string-list-init'Junio C Hamano2014-07-231-2/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | replace memset with string-list initializersta/string-list-initTanay Abhra2014-07-211-2/+1
* | | | | | | | | | | Merge branch 'mb/local-clone-after-applying-insteadof'Junio C Hamano2014-07-231-12/+13
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | use local cloning if insteadOf makes a local URLmb/local-clone-after-applying-insteadofMichael Barabanov2014-07-171-12/+13
* | | | | | | | | | | | Merge branch 'jk/tag-sort'Junio C Hamano2014-07-231-18/+50
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | tag: support configuring --sort via .gitconfigjk/tag-sortJacob Keller2014-07-171-18/+50
* | | | | | | | | | | | | Merge branch 'rs/code-cleaning'Junio C Hamano2014-07-223-19/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | use commit_list_count() to count the members of commit_listsRené Scharfe2014-07-172-18/+3