summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* add tests for `git_config_get_string_const()`ta/config-set-1Tanay Abhra2014-08-072-0/+20
* add a test for semantic errors in config filesTanay Abhra2014-08-071-0/+11
* rewrite git_config() to use the config-set APITanay Abhra2014-08-073-9/+68
* config: add `git_die_config()` to the config-set APITanay Abhra2014-08-073-2/+53
* change `git_config()` return value to voidTanay Abhra2014-08-073-7/+16
* add line number and file name info to `config_set`Tanay Abhra2014-08-072-2/+19
* config.c: fix accuracy of line number in errorsMatthieu Moy2014-08-071-1/+11
* config.c: mark error and warnings strings for translationMatthieu Moy2014-08-071-10/+10
* test-config: add tests for the config_set APITanay Abhra2014-07-294-0/+344
* add `config_set` API for caching config-like filesTanay Abhra2014-07-294-0/+457
* Sync with v2.0.3Junio C Hamano2014-07-233-2/+21
|\
| * Git 2.0.3v2.0.3Junio C Hamano2014-07-234-3/+21
| * .mailmap: combine Stefan Beller's emailsStefan Beller2014-07-231-0/+1
| * git.1: switch homepage for statsStefan Beller2014-07-231-1/+1
* | Merge branch 'rs/fix-unlink-unix-socket'Junio C Hamano2014-07-231-1/+2
|\ \
| * | unix-socket: remove stale socket before calling chdir()rs/fix-unlink-unix-socketRené Scharfe2014-07-211-1/+2
* | | Merge branch 'ta/string-list-init'Junio C Hamano2014-07-237-15/+19
|\ \ \
| * | | replace memset with string-list initializersta/string-list-initTanay Abhra2014-07-214-15/+6
| * | | string-list: add string_list initializer helper functionTanay Abhra2014-07-213-0/+13
* | | | 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-234-39/+115
|\ \ \ \ \
| * | | | | tag: support configuring --sort via .gitconfigjk/tag-sortJacob Keller2014-07-174-19/+95
| * | | | | tag: fix --sort tests to use cat<<-\EOF formatJacob Keller2014-07-131-20/+20
* | | | | | Sync with maintJunio C Hamano2014-07-221-1/+1
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge branch 'ah/fix-http-push' into maintJunio C Hamano2014-07-221-1/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'po/error-message-style' into maintJunio C Hamano2014-07-221-0/+9
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'zk/log-graph-showsig' into maintJunio C Hamano2014-07-222-0/+32
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'mg/fix-log-mergetag-color' into maintJunio C Hamano2014-07-221-10/+11
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'cb/filter-branch-prune-empty-degenerate-merges' into maintJunio C Hamano2014-07-222-1/+18
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'ye/doc-http-proto' into maintJunio C Hamano2014-07-221-1/+1
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jm/api-strbuf-doc' into maintJunio C Hamano2014-07-221-5/+5
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jm/dedup-test-config' into maintJunio C Hamano2014-07-221-5/+0
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sk/test-cmp-bin' into maintJunio C Hamano2014-07-225-22/+28
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jm/doc-wording-tweaks' into maintJunio C Hamano2014-07-222-9/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jm/instaweb-apache-24' into maintJunio C Hamano2014-07-221-1/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bg/xcalloc-nmemb-then-size' into maintJunio C Hamano2014-07-2212-21/+21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'cb/byte-order' into maintJunio C Hamano2014-07-221-9/+24
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'lt/request-pull' into maintJunio C Hamano2014-07-221-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ep/shell-assign-and-export-vars' into maintJunio C Hamano2014-07-225-5/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'maint-1.9' into maintJunio C Hamano2014-07-221-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'maint-1.8.5' into maint-1.9Junio C Hamano2014-07-221-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | Documentation: fix missing text for rev-parse --verifybrian m. carlson2014-07-221-1/+1
| | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/code-cleaning'Junio C Hamano2014-07-2213-103/+41
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | remote-testsvn: use internal argv_array of struct child_process in cmd_import()rs/code-cleaningRené Scharfe2014-07-181-9/+7
| * | | | | | | | | | | | | | | | | | | | | | bundle: use internal argv_array of struct child_process in create_bundle()René Scharfe2014-07-181-10/+5
| * | | | | | | | | | | | | | | | | | | | | | fast-import: use hashcmp() for SHA1 hash comparisonRené Scharfe2014-07-181-1/+1
| * | | | | | | | | | | | | | | | | | | | | | transport: simplify fetch_objs_via_rsync() using argv_arrayRené Scharfe2014-07-181-20/+8
| * | | | | | | | | | | | | | | | | | | | | | run-command: use internal argv_array of struct child_process in run_hook_ve()René Scharfe2014-07-171-11/+4
| * | | | | | | | | | | | | | | | | | | | | | use commit_list_count() to count the members of commit_listsRené Scharfe2014-07-175-42/+6