summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* replace: add a --raw mode for --editjk/replace-edit-rawJeff King2014-06-252-10/+29
* replace: use argv_array in export_objectcc/replace-editJeff King2014-06-251-3/+5
* avoid double close of descriptors handed to run_commandJeff King2014-06-252-3/+0
* replace: replace spaces with tabs in indentationJeff King2014-06-251-3/+3
* Documentation: replace: describe new --edit optionChristian Couder2014-05-191-1/+15
* replace: add --edit to usage stringChristian Couder2014-05-191-0/+1
* replace: add tests for --editChristian Couder2014-05-191-0/+27
* replace: die early if replace ref already existsChristian Couder2014-05-191-1/+4
* replace: refactor checking ref validityChristian Couder2014-05-191-11/+20
* replace: make sure --edit results in a different objectChristian Couder2014-05-191-0/+3
* replace: add --edit optionJeff King2014-04-291-1/+111
* replace: factor object resolution out of replace_objectJeff King2014-04-291-8/+18
* replace: use OPT_CMDMODE to handle modesJeff King2014-04-291-24/+25
* replace: refactor command-mode determinationJeff King2014-04-291-8/+6
* Merge branch 'db/make-with-curl'Junio C Hamano2014-04-281-13/+28
|\
| * Makefile: default to -lcurl when no CURL_CONFIG or CURLDIRdb/make-with-curlDave Borowitz2014-04-281-13/+28
* | Merge branch 'jk/external-diff-use-argv-array' (early part)Junio C Hamano2014-04-281-16/+16
|\ \
| * | run_external_diff: use an argv_array for the command lineJeff King2014-04-211-16/+16
* | | Git 2.0-rc1v2.0.0-rc1Junio C Hamano2014-04-252-1/+6
* | | Merge branch 'jk/pack-bitmap'Junio C Hamano2014-04-241-1/+1
|\ \ \
| * | | ewah_bitmap.c: do not assume size_t and eword_t are the same sizeKyle J. McKay2014-04-221-1/+1
* | | | Merge branch 'fc/transport-helper-sync-error-fix'Junio C Hamano2014-04-242-37/+67
|\ \ \ \
| * | | | t5801 (remote-helpers): cleanup environment setsfc/transport-helper-sync-error-fixFelipe Contreras2014-04-211-7/+4
| * | | | transport-helper: fix sync issue on crashesFelipe Contreras2014-04-142-3/+30
| * | | | transport-helper: trivial cleanupFelipe Contreras2014-04-141-12/+12
| * | | | transport-helper: propagate recvline() error pushingFelipe Contreras2014-04-141-7/+11
| * | | | remote-helpers: make recvline return an errorFelipe Contreras2014-04-141-7/+14
| * | | | transport-helper: remove barely used xchgline()Felipe Contreras2014-04-141-7/+2
* | | | | Merge branch 'db/make-with-curl'Junio C Hamano2014-04-241-12/+33
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Makefile: allow static linking against libcurlDave Borowitz2014-04-151-3/+13
| * | | | Makefile: use curl-config to determine curl flagsDave Borowitz2014-04-151-12/+23
| |/ / /
* | | | Update draft release notes to 2.0Junio C Hamano2014-04-211-3/+12
* | | | Merge git://bogomips.org/git-svnJunio C Hamano2014-04-2120-153/+131
|\ \ \ \
| * | | | Git 2.0: git svn: Set default --prefix='origin/' if --prefix is not givenJohan Herland2014-04-1920-153/+131
* | | | | Merge branch 'jx/i18n'Junio C Hamano2014-04-215-15/+15
|\ \ \ \ \
| * | | | | i18n: mention "TRANSLATORS:" marker in Documentation/CodingGuidelinesjx/i18nJunio C Hamano2014-04-181-0/+10
| * | | | | i18n: only extract comments marked with "TRANSLATORS:"Jiang Xin2014-04-172-6/+4
| * | | | | i18n: remove obsolete comments for translators in diffstat generationJiang Xin2014-04-171-8/+0
| * | | | | i18n: fix uncatchable comments for translators in date.cJiang Xin2014-04-171-1/+1
* | | | | | Merge branch 'km/avoid-non-function-return-in-rebase'Junio C Hamano2014-04-214-10/+46
|\ \ \ \ \ \
| * | | | | | Revert "rebase: fix run_specific_rebase's use of "return" on FreeBSD"km/avoid-non-function-return-in-rebaseKyle J. McKay2014-04-171-10/+1
| * | | | | | rebase: avoid non-function use of "return" on FreeBSDKyle J. McKay2014-04-173-0/+45
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'ep/shell-command-substitution'Junio C Hamano2014-04-2114-48/+48
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | t9362-mw-to-git-utf8.sh: use the $( ... ) construct for command substitutionElia Pinto2014-04-171-2/+2
| * | | | | t9360-mw-to-git-clone.sh: use the $( ... ) construct for command substitutionElia Pinto2014-04-171-7/+7
| * | | | | git-tag.sh: use the $( ... ) construct for command substitutionElia Pinto2014-04-171-1/+1
| * | | | | git-revert.sh: use the $( ... ) construct for command substitutionElia Pinto2014-04-171-1/+1
| * | | | | git-resolve.sh: use the $( ... ) construct for command substitutionElia Pinto2014-04-171-1/+1
| * | | | | git-repack.sh: use the $( ... ) construct for command substitutionElia Pinto2014-04-171-1/+1
| * | | | | git-merge.sh: use the $( ... ) construct for command substitutionElia Pinto2014-04-171-2/+2