summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | inet_ntop.c: Work around GCC 4.6's detection of uninitialized variablesss/inet-ntopSebastian Schuberth2011-10-181-0/+2
* | | | | | | | | | | | | | Merge branch 'jc/maint-remove-renamed-ref'Junio C Hamano2011-10-211-8/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | branch -m/-M: remove undocumented RENAMED-REFJunio C Hamano2011-10-121-8/+0
* | | | | | | | | | | | | | | Merge branch 'pw/p4-update'Junio C Hamano2011-10-216-423/+919
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | git-p4: handle files with shell metacharactersLuke Diamand2011-10-172-77/+187
| * | | | | | | | | | | | | | | git-p4: keyword flattening fixesPete Wyckoff2011-10-171-2/+6
| * | | | | | | | | | | | | | | git-p4: stop ignoring apple filetypePete Wyckoff2011-10-171-5/+0
| * | | | | | | | | | | | | | | git-p4: recognize all p4 filetypesPete Wyckoff2011-10-171-19/+52
| * | | | | | | | | | | | | | | git-p4: handle utf16 filetype properlyPete Wyckoff2011-10-172-0/+119
| * | | | | | | | | | | | | | | git-p4 tests: refactor and cleanupPete Wyckoff2011-10-173-324/+559
* | | | | | | | | | | | | | | | Merge branch 'cn/doc-config-bare-subsection'Junio C Hamano2011-10-211-3/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Documentation: update [section.subsection] to reflect what git doescn/doc-config-bare-subsectionCarlos Martín Nieto2011-10-161-3/+4
* | | | | | | | | | | | | | | | | Merge branch 'jk/maint-pack-objects-compete-with-delete'Junio C Hamano2011-10-213-2/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | downgrade "packfile cannot be accessed" errors to warningsjk/maint-pack-objects-compete-with-deleteJeff King2011-10-142-2/+2
| * | | | | | | | | | | | | | | | | pack-objects: protect against disappearing packsJeff King2011-10-143-1/+6
| | |_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'jk/daemon-msgs'Junio C Hamano2011-10-212-8/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | daemon: give friendlier error messages to clientsjk/daemon-msgsJeff King2011-10-152-4/+31
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge branch 'sc/difftool-skip'Junio C Hamano2011-10-212-4/+48
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | t7800: avoid arithmetic expansion notationsc/difftool-skipJunio C Hamano2011-10-141-2/+2
| * | | | | | | | | | | | | | | | | git-difftool: allow skipping file by typing 'n' at promptSitaram Chamarty2011-10-102-4/+48
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge branch 'jc/unseekable-bundle'Junio C Hamano2011-10-213-59/+90
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | bundle: add parse_bundle_header() helper functionjc/unseekable-bundleJunio C Hamano2011-10-133-9/+33
| * | | | | | | | | | | | | | | | | bundle: allowing to read from an unseekable fdJunio C Hamano2011-10-131-35/+64
* | | | | | | | | | | | | | | | | | Merge branch 'ph/transport-with-gitfile'Junio C Hamano2011-10-215-20/+58
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Fix is_gitfile() for files too small or larger than PATH_MAX to be a gitfileph/transport-with-gitfileJohannes Schindelin2011-10-111-2/+2
| * | | | | | | | | | | | | | | | | | Add test showing git-fetch groks gitfilesPhil Hord2011-10-041-0/+14
| * | | | | | | | | | | | | | | | | | Teach transport about the gitfile mechanismPhil Hord2011-10-041-1/+23
| * | | | | | | | | | | | | | | | | | Learn to handle gitfiles in enter_repoPhil Hord2011-10-041-1/+7
| * | | | | | | | | | | | | | | | | | enter_repo: do not modify inputErik Faye-Lund2011-10-043-19/+15
| | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Sync with maintJunio C Hamano2011-10-212-24/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Almost ready for 1.7.7.1Junio C Hamano2011-10-211-0/+20
| * | | | | | | | | | | | | | | | | Merge branch 'nd/maint-autofix-tag-in-head' into maintJunio C Hamano2011-10-217-65/+93
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/apply-blank-at-eof-fix' into maintJunio C Hamano2011-10-211-2/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jn/no-g-plus-s-on-bsd' into maintJunio C Hamano2011-10-211-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/diff-cleanup-records-fix' into maintJunio C Hamano2011-10-213-3/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'il/archive-err-signal' into maintJunio C Hamano2011-10-211-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/maint-merge-one-file-osx-expr' into maintJunio C Hamano2011-10-211-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jm/maint-apply-detects-corrupt-patch-header' into maintJunio C Hamano2011-10-212-0/+46
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/checkout-from-tree-keep-local-changes' into maintJunio C Hamano2011-10-212-1/+47
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mm/maint-config-explicit-bool-display' into maintJunio C Hamano2011-10-212-7/+19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | | | | tests: add missing executable bitsJeff King2011-10-202-0/+0
* | | | | | | | | | | | | | | | | | | | | | | | | | | Update draft release notes to 1.7.8Junio C Hamano2011-10-191-2/+22
* | | | | | | | | | | | | | | | | | | | | | | | | | | t/t3000-ls-files-others.sh: use $SHELL_PATH to run git-new-workdir scriptBrandon Casey2011-10-191-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/merge-edit-option'Junio C Hamano2011-10-193-39/+99
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Teach merge the '[-e|--edit]' optionJay Soffian2011-10-123-39/+99
| | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/diff-whole-function'Junio C Hamano2011-10-196-16/+175
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | diff: add option to show whole functions as contextrs/diff-whole-functionRené Scharfe2011-10-106-6/+154
| * | | | | | | | | | | | | | | | | | | | | | | | | | | xdiff: factor out get_func_line()René Scharfe2011-10-101-16/+27
| |/ / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/pickaxe'Junio C Hamano2011-10-191-108/+70
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | pickaxe: factor out pickaxers/pickaxeRené Scharfe2011-10-071-67/+43