summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'es/blame-L-twice'Junio C Hamano2013-09-0911-88/+282
|\
| * line-range: reject -L line numbers less than 1es/blame-L-twiceEric Sunshine2013-08-062-10/+13
| * t8001/t8002: blame: add tests of -L line numbers less than 1Eric Sunshine2013-08-061-0/+12
| * line-range: teach -L^:RE to search from start of fileEric Sunshine2013-08-064-2/+26
| * line-range: teach -L:RE to search from end of previous -L rangeEric Sunshine2013-08-064-7/+25
| * line-range: teach -L^/RE/ to search from start of fileEric Sunshine2013-08-063-2/+30
| * line-range-format.txt: document -L/RE/ relative searchEric Sunshine2013-08-061-1/+3
| * log: teach -L/RE/ to search from end of previous -L rangeEric Sunshine2013-08-061-3/+12
| * blame: teach -L/RE/ to search from end of previous -L rangeEric Sunshine2013-08-062-1/+24
| * line-range: teach -L/RE/ to search relative to anchor pointEric Sunshine2013-08-064-7/+32
| * blame: document multiple -L supportEric Sunshine2013-08-062-6/+12
| * t8001/t8002: blame: add tests of multiple -L optionsEric Sunshine2013-08-061-0/+32
| * blame: accept multiple -L rangesEric Sunshine2013-08-061-32/+47
| * blame: inline one-line function into its lone callerEric Sunshine2013-08-061-14/+3
| * range-set: publish API for re-use by git-blame -LEric Sunshine2013-08-062-5/+17
| * line-range-format.txt: clarify -L:regex usage formEric Sunshine2013-08-063-8/+3
| * git-log.txt: place each -L option variation on its own lineEric Sunshine2013-08-061-1/+2
* | Merge branch 'tr/log-full-diff-keep-true-parents'Junio C Hamano2013-09-098-3/+134
|\ \
| * | log: use true parents for diff when walking reflogstr/log-full-diff-keep-true-parentsThomas Rast2013-08-052-3/+47
| * | log: use true parents for diff even when rewritingThomas Rast2013-08-017-3/+90
* | | Merge branch 'jk/cat-file-batch-optim'Junio C Hamano2013-09-093-5/+55
|\ \ \
| * | | cat-file: only split on whitespace when %(rest) is usedjk/cat-file-batch-optimJeff King2013-08-053-5/+55
* | | | Merge branch 'es/blame-L-more'Junio C Hamano2013-09-095-19/+166
|\ \ \ \ | | |_|/ | |/| |
| * | | blame: reject empty ranges -L,+0 and -L,-0es/blame-L-moreEric Sunshine2013-08-052-3/+3
| * | | t8001/t8002: blame: demonstrate acceptance of bogus -L,+0 and -L,-0Eric Sunshine2013-08-051-0/+8
| * | | blame: reject empty ranges -LX,+0 and -LX,-0Eric Sunshine2013-08-052-2/+4
| * | | t8001/t8002: blame: demonstrate acceptance of bogus -LX,+0 and -LX,-0Eric Sunshine2013-08-051-0/+8
| * | | log: fix -L bounds checking bugEric Sunshine2013-08-052-3/+3
| * | | t4211: retire soon-to-be unimplementable testsEric Sunshine2013-08-051-13/+0
| * | | t4211: log: demonstrate -L bounds checking bugEric Sunshine2013-08-051-0/+30
| * | | blame: fix -L bounds checking bugEric Sunshine2013-08-052-6/+6
| * | | t8001/t8002: blame: add empty file & partial-line testsEric Sunshine2013-08-051-0/+72
| * | | t8001/t8002: blame: demonstrate -L bounds checking bugEric Sunshine2013-08-051-0/+22
| * | | t8001/t8002: blame: decompose overly-large testEric Sunshine2013-08-051-7/+25
* | | | Merge branch 'db/http-savecookies'Junio C Hamano2013-09-094-1/+36
|\ \ \ \
| * | | | t5551: Remove header from curl cookie filedb/http-savecookiesBrian Gernhardt2013-08-051-4/+2
| * | | | http: add http.savecookies option to write out HTTP cookiesDave Borowitz2013-07-304-1/+38
* | | | | Merge branch 'jc/push-cas'Junio C Hamano2013-09-0922-98/+638
|\ \ \ \ \
| * | | | | push: teach --force-with-lease to smart-http transportJunio C Hamano2013-08-024-5/+40
| * | | | | send-pack: fix parsing of --force-with-lease optionJunio C Hamano2013-08-021-1/+1
| * | | | | t5540/5541: smart-http does not support "--force-with-lease"Junio C Hamano2013-08-011-0/+16
| * | | | | t5533: test "push --force-with-lease"Junio C Hamano2013-07-221-0/+189
| * | | | | push --force-with-lease: tie it all togetherJunio C Hamano2013-07-226-13/+54
| * | | | | push --force-with-lease: implement logic to populate old_sha1_expect[]Junio C Hamano2013-07-226-0/+87
| * | | | | remote.c: add command line option parser for "--force-with-lease"Junio C Hamano2013-07-225-11/+168
| * | | | | builtin/push.c: use OPT_BOOL, not OPT_BOOLEANJunio C Hamano2013-07-081-3/+3
| * | | | | cache.h: move remote/connect API out of itJunio C Hamano2013-07-0815-70/+87
* | | | | | Merge branch 'nd/clone-connectivity-shortcut'Junio C Hamano2013-09-095-1/+47
|\ \ \ \ \ \
| * | | | | | smart http: use the same connectivity check on cloningnd/clone-connectivity-shortcutNguyễn Thái Ngọc Duy2013-07-235-1/+47
* | | | | | | Merge branch 'jc/diff-filter-negation'Junio C Hamano2013-09-094-29/+118
|\ \ \ \ \ \ \
View Lorry Controller Status