summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* diffcore-pickaxe: simplify has_changes and containsrs/pickaxe-simplifyRené Scharfe2013-07-071-7/+4
* diffcore-pickaxe: unify code for log -S/-GJeff King2013-04-051-69/+49
* diffcore-pickaxe: fix leaks in "log -S<block>" and "log -G<pattern>"Junio C Hamano2013-04-051-5/+7
* diffcore-pickaxe: port optimization from has_changes() to diff_grep()Junio C Hamano2013-04-051-1/+6
* diffcore-pickaxe: respect --no-textconvSimon Ruderich2013-04-052-4/+36
* diffcore-pickaxe: remove fill_one()Jeff King2013-04-041-20/+10
* diffcore-pickaxe: remove unnecessary call to get_textconv()Simon Ruderich2013-04-041-9/+14
* pickaxe: use textconv for -S countingJeff King2012-10-282-17/+51
* pickaxe: hoist empty needle checkJeff King2012-10-281-2/+3
* diff_grep: use textconv buffers for add/deleted filesJeff King2012-10-282-2/+14
* Git 1.7.12.4v1.7.12.4maint-1.7.12Junio C Hamano2012-10-174-3/+27
* Merge branch 'jk/maint-http-half-auth-push' into maintJunio C Hamano2012-10-173-6/+6
|\
| * http: fix segfault in handle_curl_resultJeff King2012-10-123-6/+6
* | Merge branch 'rr/git-uri-doc' into maintJunio C Hamano2012-10-171-2/+6
|\ \
| * | Git url doc: mark ftp/ftps as read-only and deprecate themRamkumar Ramachandra2012-10-081-2/+6
* | | Merge branch 'bw/cp-a-is-gnuism' into maintJunio C Hamano2012-10-173-3/+3
|\ \ \
| * | | tests: "cp -a" is a GNUismBen Walton2012-10-083-3/+3
| |/ /
* | | Merge branch 'nd/doc-ignore' into maintJunio C Hamano2012-10-171-1/+5
|\ \ \
| * | | gitignore.txt: suggestions how to get literal # or ! at the beginningNguyễn Thái Ngọc Duy2012-10-071-1/+5
* | | | Merge branch 'jc/doc-long-options' into maintJunio C Hamano2012-10-171-1/+11
|\ \ \ \
| * | | | gitcli: parse-options lets you omit tail of long optionsJunio C Hamano2012-10-041-1/+11
* | | | | Merge branch 'jc/maint-t1450-fsck-order-fix' into maintJunio C Hamano2012-10-171-3/+1
|\ \ \ \ \
| * | | | | t1450: the order the objects are checked is undefinedJunio C Hamano2012-10-021-3/+1
* | | | | | Merge branch 'rr/test-use-shell-path-not-shell' into maintJunio C Hamano2012-10-171-16/+16
|\ \ \ \ \ \
| * | | | | | test-lib: use $SHELL_PATH, not $SHELLRamkumar Ramachandra2012-09-251-16/+16
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'rr/test-make-sure-we-have-git' into maintJunio C Hamano2012-10-172-10/+9
|\ \ \ \ \ \
| * | | | | | t/test-lib: make sure Git has already been builtRamkumar Ramachandra2012-09-182-10/+9
* | | | | | | Merge branch 'po/maint-docs' into maintJunio C Hamano2012-10-175-15/+28
|\ \ \ \ \ \ \
| * | | | | | | Doc branch: show -vv option and alternativePhilip Oakley2012-09-191-1/+3
| * | | | | | | Doc clean: add See Also linkPhilip Oakley2012-09-181-0/+4
| * | | | | | | Doc add: link gitignorePhilip Oakley2012-09-181-1/+1
| * | | | | | | Doc: separate gitignore pattern sourcesPhilip Oakley2012-09-181-12/+18
| * | | | | | | Doc: shallow clone deepens _to_ new depthPhilip Oakley2012-09-181-1/+2
* | | | | | | | Merge branch 'jc/ll-merge-binary-ours' into maintJunio C Hamano2012-10-175-12/+41
|\ \ \ \ \ \ \ \
| * | | | | | | | ll-merge: warn about inability to merge binary files only when we can'tJunio C Hamano2012-09-121-3/+4
| * | | | | | | | attr: "binary" attribute should choose built-in "binary" merge driverJunio C Hamano2012-09-083-3/+3
| * | | | | | | | merge: teach -Xours/-Xtheirs to binary ll-merge driverJunio C Hamano2012-09-083-7/+35
* | | | | | | | | Merge branch 'db/doc-custom-xmlto' into maintJunio C Hamano2012-10-171-2/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Documentation/Makefile: Allow custom XMLTO binaryDave Borowitz2012-09-191-2/+3
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Fix spelling error in post-receive-email hookRichard Fearn2012-10-131-1/+1
* | | | | | | | | gitweb.cgi: fix "comitter_tz" typo in feedDylan Alex Simon2012-10-121-1/+1
* | | | | | | | | attr: a note about the order of .gitattributes lookupNguyen Thai Ngoc Duy2012-10-101-0/+5
* | | | | | | | | Merge branch 'maint' of git://github.com/git-l10n/git-po into maintJunio C Hamano2012-10-091-7/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | l10n: de.po: fix a few minor typosSimon Ruderich2012-10-041-7/+7
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Git 1.7.12.3v1.7.12.3Junio C Hamano2012-10-083-2/+19
* | | | | | | | | Merge branch 'os/commit-submodule-ignore' into maintJunio C Hamano2012-10-081-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | commit: pay attention to submodule.$name.ignore in .gitmodulesOrgad Shaneh2012-09-241-0/+1
* | | | | | | | | | Merge branch 'jk/receive-pack-unpack-error-to-pusher' into maintJunio C Hamano2012-10-082-5/+32
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | receive-pack: drop "n/a" on unpacker errorsJeff King2012-09-212-2/+2
| * | | | | | | | | | receive-pack: send pack-processing stderr over sidebandJeff King2012-09-211-2/+24