summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | | | | | Merge branch 'tb/crlf-tests'Junio C Hamano2014-09-195-120/+178
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | MinGW: update tests to handle a native eol of crlftb/crlf-testsBrice Lambson2014-09-022-20/+35
| * | | | | | | | | | | | | | | | | | | | | Makefile: propagate NATIVE_CRLF to CPat Thoyts2014-09-022-0/+23
| * | | | | | | | | | | | | | | | | | | | | t0027: Tests for core.eol=native, eol=lf, eol=crlfTorsten Bögershausen2014-08-281-100/+120
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/simplify-http-walker'Junio C Hamano2014-09-191-9/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | http-walker: simplify process_alternates_response() using strbufrs/simplify-http-walkerRené Scharfe2014-09-021-9/+6
| | |/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/simplify-config-include'Junio C Hamano2014-09-191-5/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | config: simplify git_config_include()rs/simplify-config-includeRené Scharfe2014-09-021-5/+1
| |/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/merge-tree-simplify'Junio C Hamano2014-09-191-12/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | merge-tree: remove unused df_conflict argumentsrs/merge-tree-simplifyRené Scharfe2014-09-021-12/+6
| |/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'da/styles'Junio C Hamano2014-09-197-9/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | stylefix: asterisks stick to the variable, not the typeda/stylesDavid Aguilar2014-09-027-9/+10
| |/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'ah/grammofix'Junio C Hamano2014-09-198-10/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | grammofix in user-facing messagesah/grammofixAlex Henrie2014-09-028-10/+10
| |/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/more-uses-of-skip-prefix'Junio C Hamano2014-09-192-16/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | pack-write: simplify index_pack_lockfile using skip_prefix() and xstrfmt()rs/further-uses-of-skip-prefixrs/furhter-uses-of-skip-prefixRené Scharfe2014-09-021-6/+5
| * | | | | | | | | | | | | | | | | | | | | | connect: simplify check_ref() using skip_prefix() and starts_with()René Scharfe2014-09-021-10/+6
| |/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'mb/fast-import-delete-root'Junio C Hamano2014-09-192-1/+109
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | fast-import: fix segfault in store_tree()mb/fast-import-delete-rootMaxim Bublis2014-08-292-3/+7
| * | | | | | | | | | | | | | | | | | | | | | t9300: test filedelete commandMaxim Bublis2014-08-291-0/+104
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jp/index-with-corrupt-stages'Junio C Hamano2014-09-191-1/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | read_index_unmerged(): remove unnecessary loop index adjustmentjp/index-with-corrupt-stagesJaime Soriano Pastor2014-08-291-1/+0
| * | | | | | | | | | | | | | | | | | | | | | | read_index_from(): catch out of order entries when reading an index fileJaime Soriano Pastor2014-08-291-0/+18
| | |_|_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/index-pack-threading-races'Junio C Hamano2014-09-191-2/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | index-pack: fix race condition with duplicate basesjk/index-pack-threading-racesJeff King2014-08-291-2/+31
| | |_|_|_|_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/commit-author-parsing'Junio C Hamano2014-09-199-120/+130
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | determine_author_info(): copy getenv outputjk/commit-author-parsingJeff King2014-08-291-13/+27
| * | | | | | | | | | | | | | | | | | | | | | | determine_author_info(): reuse parsing functionsJeff King2014-08-291-28/+21
| * | | | | | | | | | | | | | | | | | | | | | | date: use strbufs in date-formatting functionsJeff King2014-08-276-48/+45
| * | | | | | | | | | | | | | | | | | | | | | | record_author_date(): use find_commit_header()Jeff King2014-08-271-14/+8
| * | | | | | | | | | | | | | | | | | | | | | | record_author_date(): fix memory leak on malformed commitJeff King2014-08-271-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | commit: provide a function to find a header in a bufferJeff King2014-08-273-27/+39
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'bb/date-iso-strict'Junio C Hamano2014-09-198-7/+45
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | pretty: provide a strict ISO 8601 date formatbb/date-iso-strictBeat Bolli2014-08-298-7/+45
| |/ / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mb/build-contrib-svn-fe'Junio C Hamano2014-09-191-9/+51
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | contrib/svn-fe: fix Makefilemb/build-contrib-svn-feMaxim Bublis2014-08-281-9/+51
| |/ / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/fast-export-anonymize'Junio C Hamano2014-09-193-11/+462
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | docs/fast-export: explain --anonymize more completelyjk/fast-export-anonymizeJeff King2014-08-281-4/+59
| * | | | | | | | | | | | | | | | | | | | | | | | teach fast-export an --anonymize optionJeff King2014-08-273-11/+407
| |/ / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/send-pack-many-refspecs'Junio C Hamano2014-09-195-2/+153
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | send-pack: take refspecs over stdinjk/send-pack-many-refspecsJeff King2014-08-265-2/+153
| | |_|_|/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | git-svn: delay term initializationEric Wong2014-09-141-7/+11
* | | | | | | | | | | | | | | | | | | | | | | | git svn: find-rev allows short switches for near matchesEric Wong2014-09-142-2/+4
* | | | | | | | | | | | | | | | | | | | | | | | git-svn.txt: Remove mentions of repack optionsLawrence Velázquez2014-09-141-15/+0
* | | | | | | | | | | | | | | | | | | | | | | | git svn: info: correctly handle absolute path argsEric Wong2014-09-142-6/+63
* | | | | | | | | | | | | | | | | | | | | | | | git-svn: branch: avoid systematic prompt for cert/passMonard Vong2014-09-141-1/+3
| |_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Update draft release notes to 2.2Junio C Hamano2014-09-111-1/+42
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'br/imap-send-simplify-tunnel-child-process'Junio C Hamano2014-09-111-10/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | imap-send: simplify v_issue_imap_cmd() and get_cmd_result() using starts_with()br/imap-send-simplify-tunnel-child-processRené Scharfe2014-09-021-2/+2
| * | | | | | | | | | | | | | | | | | | | | | | imap-send.c: imap_folder -> imap_server_conf.folderBernhard Reiter2014-08-201-5/+5