summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* rename "match_refs()" to "match_push_refs()"jc/match-refs-clarifyJunio C Hamano2011-09-126-14/+17
* send-pack: typofix error messageJunio C Hamano2011-09-121-1/+1
* refactor run_receive_hook()Junio C Hamano2011-09-121-19/+52
* Update draft release notes to 1.7.7Junio C Hamano2011-09-061-1/+6
* Merge branch 'rc/histogram-diff'Junio C Hamano2011-09-061-0/+2
|\
| * xdiff/xprepare: initialise xdlclassifier_t cf in xdl_prepare_env()Tay Ray Chuan2011-08-311-0/+2
* | Merge branch 'cb/maint-ls-files-error-report'Junio C Hamano2011-09-061-10/+12
|\ \
| * | t3005: do not assume a particular order of stdout and stderr of git-ls-filesJohannes Sixt2011-08-281-10/+12
* | | Merge branch 'mh/check-ref-format-print-normalize'Junio C Hamano2011-09-063-4/+13
|\ \ \
| * | | Forbid DEL characters in reference namesMichael Haggerty2011-08-272-1/+4
| * | | check-ref-format --print: Normalize refnames that start with slashesMichael Haggerty2011-08-252-3/+9
* | | | Sync with 1.7.6.2Junio C Hamano2011-09-068-41/+21
|\ \ \ \
| * | | | Git 1.7.6.2v1.7.6.2Junio C Hamano2011-09-064-4/+13
| * | | | Revert "Merge branch 'cb/maint-quiet-push' into maint"Junio C Hamano2011-09-066-39/+10
* | | | | Update draft release notes to 1.7.7Junio C Hamano2011-09-021-2/+10
* | | | | Merge branch 'js/i18n-scripts-2'Junio C Hamano2011-09-021-35/+14
|\ \ \ \ \
| * | | | | bisect: take advantage of gettextln, eval_gettextln.Jon Seymour2011-08-301-35/+14
* | | | | | Merge branch 'tr/maint-t3903-misquoted-command'Junio C Hamano2011-09-021-1/+1
|\ \ \ \ \ \
| * | | | | | t3903: fix misquoted rev-parse invocationThomas Rast2011-08-301-1/+1
* | | | | | | Merge branch 'bc/bisect-test-use-shell-path'Junio C Hamano2011-09-021-1/+1
|\ \ \ \ \ \ \
| * | | | | | | t6030: use $SHELL_PATH to invoke user's preferred shell instead of bare shBrandon Casey2011-08-301-1/+1
* | | | | | | | Merge branch 'va/p4-branch-import-test-update'Junio C Hamano2011-09-021-11/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | git-p4: simple branch tests editsPete Wyckoff2011-08-291-11/+8
* | | | | | | | | Merge branch 'tr/maint-strbuf-grow-nul-termination'Junio C Hamano2011-09-021-4/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | strbuf_grow(): maintain nul-termination even for new bufferThomas Rast2011-08-291-4/+5
* | | | | | | | | | Merge branch 'tr/maint-ident-to-git-memmove'Junio C Hamano2011-09-021-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Use memmove in ident_to_gitThomas Rast2011-08-291-2/+2
* | | | | | | | | | | Merge branch 'tr/maint-format-patch-empty-output'Junio C Hamano2011-09-022-4/+28
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Document negated forms of format-patch --to --cc --add-headersThomas Rast2011-08-291-1/+8
| * | | | | | | | | | | t4014: "no-add-headers" is actually called "no-add-header"Thomas Rast2011-08-291-2/+2
| * | | | | | | | | | | t4014: invoke format-patch with --stdout where intendedThomas Rast2011-08-291-2/+2
| * | | | | | | | | | | t4014: check for empty files from git format-patch --stdoutThomas Rast2011-08-291-2/+19
* | | | | | | | | | | | Merge branch 'gb/maint-am-stgit-author-to-from-fix'Junio C Hamano2011-09-021-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | am: fix stgit patch manglingGiuseppe Bilotta2011-08-291-1/+1
* | | | | | | | | | | | | Merge branch 'gb/maint-am-patch-format-error-message'Junio C Hamano2011-09-022-1/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | am: format is in $patch_format, not parse_patchGiuseppe Bilotta2011-08-291-1/+2
* | | | | | | | | | | | | | Merge branch 'ms/daemon-timeout-is-in-seconds'Junio C Hamano2011-09-021-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | git-daemon.txt: specify --timeout in secondsMichael Stapelberg2011-08-281-5/+5
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'bg/t5540-osx-grep'Junio C Hamano2011-09-021-2/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | t5540-http-test: shorten grep patternBrian Gernhardt2011-08-281-2/+6
* | | | | | | | | | | | | | | Merge branch 'jc/clean-exclude-doc'Junio C Hamano2011-09-022-6/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Documentation: clarify "git clean -e <pattern>"Junio C Hamano2011-08-282-6/+9
* | | | | | | | | | | | | | | | Merge branch 'mg/maint-notes-C-doc'Junio C Hamano2011-09-021-2/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | git-notes.txt: clarify -C vs. copy and -FMichael J Gruber2011-08-251-2/+5
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch 'fg/submodule-ff-check-before-push'Junio C Hamano2011-09-027-0/+231
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | push: Don't push a repository with unpushed submodulesFredrik Gustafsson2011-08-207-0/+231
* | | | | | | | | | | | | | | | | Merge branch 'rc/diff-cleanup-records'Junio C Hamano2011-09-021-37/+51
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rc/histogram-diff' into HEADJunio C Hamano2011-08-1714-285/+655
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | xdiff/xprepare: improve O(n*m) performance in xdl_cleanup_records()Tay Ray Chuan2011-08-171-36/+50
* | | | | | | | | | | | | | | | | | Merge branch 'fk/use-kwset-pickaxe-grep-f'Junio C Hamano2011-09-029-34/+1830
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \