summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | compat/bswap.h: restore preference __BIG_ENDIAN over BIG_ENDIANJunio C Hamano2014-05-021-7/+7
| * | | | | | | | | | | | compat/bswap.h: detect endianness on more platforms that don't use BYTE_ORDERCharles Bailey2014-05-021-9/+24
* | | | | | | | | | | | | Merge branch 'jk/strbuf-tolower'Junio C Hamano2014-06-164-7/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | strbuf: add strbuf_tolower functionjk/strbuf-tolowerJeff King2014-05-234-7/+13
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'jk/daemon-tolower'Junio C Hamano2014-06-164-22/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | daemon/config: factor out duplicate xstrdup_tolowerjk/daemon-tolowerJeff King2014-05-234-22/+16
| | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'as/pretty-truncate'Junio C Hamano2014-06-165-72/+282
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | pretty.c: format string with truncate respects logOutputEncodingas/pretty-truncateAlexey Shumkin2014-05-213-8/+13
| * | | | | | | | | | | | | t4205, t6006: add tests that fail with i18n.logOutputEncoding setAlexey Shumkin2014-05-212-2/+213
| * | | | | | | | | | | | | t4205 (log-pretty-format): use `tformat` rather than `format`Alexey Shumkin2014-05-211-39/+13
| * | | | | | | | | | | | | t4041, t4205, t6006, t7102: don't hardcode tested encoding valueAlexey Shumkin2014-05-214-27/+39
| * | | | | | | | | | | | | t4205 (log-pretty-formats): don't hardcode SHA-1 in expected outputsAlexey Shumkin2014-05-191-3/+11
* | | | | | | | | | | | | | Merge branch 'jk/diff-follow-must-take-one-pathspec'Junio C Hamano2014-06-162-6/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | move "--follow needs one pathspec" rule to diff_setup_donejk/diff-follow-must-take-one-pathspecJeff King2014-05-202-6/+5
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'sk/windows-unc-path'Junio C Hamano2014-06-165-8/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Windows: allow using UNC path for git repositorysk/windows-unc-pathCezary Zawadka2014-06-105-8/+30
| | |_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'rr/rebase-autostash-fix'Junio C Hamano2014-06-163-3/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | rebase -i: test "Nothing to do" case with autostashrr/rebase-autostash-fixMatthieu Moy2014-05-201-0/+15
| * | | | | | | | | | | | | | rebase -i: handle "Nothing to do" case with autostashRamkumar Ramachandra2014-05-192-3/+12
* | | | | | | | | | | | | | | Merge branch 'jk/report-fail-to-read-objects-better'Junio C Hamano2014-06-161-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | open_sha1_file: report "most interesting" errnojk/report-fail-to-read-objects-betterJeff King2014-05-151-1/+5
| | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'jk/diff-files-assume-unchanged'Junio C Hamano2014-06-162-12/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | run_diff_files: do not look at uninitialized stat datajk/diff-files-assume-unchangedJeff King2014-05-152-12/+32
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'jk/argv-array-for-child-process'Junio C Hamano2014-06-169-107/+57
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | argv-array: drop "detach" codejk/argv-array-for-child-processJeff King2014-05-153-30/+0
| * | | | | | | | | | | | | | | get_importer: use run-command's internal argv_arrayJeff King2014-05-151-6/+3
| * | | | | | | | | | | | | | | get_exporter: use argv_arrayJeff King2014-05-151-16/+10
| * | | | | | | | | | | | | | | get_helper: use run-command's internal argv_arrayJeff King2014-05-151-6/+3
| * | | | | | | | | | | | | | | git_connect: use argv_arrayJeff King2014-05-151-18/+10
| * | | | | | | | | | | | | | | run_column_filter: use argv_arrayJeff King2014-05-151-30/+13
| * | | | | | | | | | | | | | | run-command: store an optional argv_arrayJeff King2014-05-153-1/+18
| | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'sk/wincred'Junio C Hamano2014-06-161-4/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | wincred: avoid overwriting configured variablessk/wincredPat Thoyts2014-05-141-4/+4
| * | | | | | | | | | | | | | | wincred: add install targetPat Thoyts2014-05-141-0/+8
| | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'jk/do-not-run-httpd-tests-as-root'Junio C Hamano2014-06-161-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | t/lib-httpd: require SANITY prereqjk/do-not-run-httpd-tests-as-rootJeff King2014-05-121-0/+5
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'cc/replace-edit'Junio C Hamano2014-06-163-46/+222
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | 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 'mt/patch-id-stable' (early part)Junio C Hamano2014-06-165-31/+208
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | patch-id-test: test stable and unstable behaviourMichael S. Tsirkin2014-06-101-11/+91
| * | | | | | | | | | | | | | | | patch-id: make it stable against hunk reorderingMichael S. Tsirkin2014-06-102-20/+91