summaryrefslogtreecommitdiff
path: root/sha1_name.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'nd/extended-sha1-relpath'Junio C Hamano2010-12-161-2/+35
|\
| * get_sha1: teach ":$n:<path>" the same relative path logicJunio C Hamano2010-12-091-6/+8
| * get_sha1: support relative path ":path" syntaxNguyễn Thái Ngọc Duy2010-12-071-3/+34
* | Merge branch 'jn/thinner-wrapper'Junio C Hamano2010-12-031-0/+18
|\ \
| * | strbuf: move strbuf_branchname to sha1_name.cJonathan Nieder2010-11-101-0/+18
| |/
* | Merge branch 'jc/abbrev-guard'Junio C Hamano2010-12-031-1/+3
|\ \
| * | core.abbrevguard: Ensure short object names stay unique a bit longerJunio C Hamano2010-10-281-1/+3
| |/
* | Merge branch 'ks/no-textconv-symlink'Junio C Hamano2010-11-171-0/+2
|\ \ | |/ |/|
| * blame,cat-file --textconv: Don't assume mode is ``S_IFREF | 0664''Kirill Smelkov2010-09-291-0/+2
| * Merge branch 'jc/sha1-name-find-fix' into maintJunio C Hamano2010-08-191-10/+11
| |\
* | | update comment and documentation for :/foo syntaxMatthieu Moy2010-09-271-0/+1
* | | Merge branch 'js/maint-reflog-beyond-horizon'Junio C Hamano2010-09-031-9/+9
|\ \ \
| * | | sha1_name.c: use warning in preference to fprintf(stderrJon Seymour2010-08-241-5/+4
| * | | rev-parse: exit with non-zero status if ref@{n} is not valid.Jon Seymour2010-08-241-4/+5
| |/ /
* | | Merge branch 'jc/sha1-name-find-fix'Junio C Hamano2010-08-121-10/+11
|\ \ \ | |/ / |/| / | |/
| * sha1_name.c: fix parsing of ":/token" syntaxJunio C Hamano2010-08-021-10/+11
* | Merge branch 'cp/textconv-cat-file'Junio C Hamano2010-06-271-5/+26
|\ \
| * | sha1_name: add get_sha1_with_context()Clément Poulain2010-06-181-5/+26
| |/
* | Make :/ accept a regex rather than a fixed patternLinus Torvalds2010-06-141-3/+9
|/
* sha1_name: fix segfault caused by invalid index accessMarkus Heidelberg2010-02-281-14/+18
* Merge branch 'maint-1.6.6' into maintJunio C Hamano2010-02-161-2/+1
|\
| * Merge branch 'maint-1.6.5' into maint-1.6.6Junio C Hamano2010-02-161-2/+1
| |\
| | * dwim_ref: fix dangling symref warningJeff King2010-02-161-2/+1
* | | reject @{-1} not at beginning of object nameJeff King2010-01-281-0/+4
* | | fix parsing of @{-1}@{u} combinationJeff King2010-01-281-2/+22
* | | Merge branch 'jc/maint-reflog-bad-timestamp'Junio C Hamano2010-01-271-1/+4
|\ \ \ | |/ /
| * | Update @{bogus.timestamp} fix not to die()Junio C Hamano2010-01-271-2/+2
| * | approxidate_careful() reports errorneous date stringJunio C Hamano2010-01-261-1/+4
| |/
* | Merge branch 'js/refer-upstream'Junio C Hamano2010-01-221-13/+78
|\ \
| * | Teach @{upstream} syntax to strbuf_branchanme()Junio C Hamano2010-01-201-42/+74
| * | Introduce <branch>@{upstream} notationJohannes Schindelin2010-01-121-3/+36
| |/
* | Merge branch 'jc/checkout-merge-base'Junio C Hamano2010-01-131-0/+42
|\ \
| * | "checkout A...B" switches to the merge base between A and BJunio C Hamano2009-10-181-0/+42
| |/
* | Detailed diagnosis when parsing an object name fails.Matthieu Moy2009-12-071-4/+111
|/
* sha1_name.c: avoid unnecessary strbuf_releaseBrandon Casey2009-07-161-2/+0
* Rename interpret/substitute nth_last_branch functionsJunio C Hamano2009-03-221-6/+6
* Squelch overzealous "ignoring dangling symref" in an empty repositoryJunio C Hamano2009-02-111-1/+2
* Warn use of "origin" when remotes/origin/HEAD is danglingJunio C Hamano2009-02-101-2/+4
* Merge branch 'tr/previous-branch'Junio C Hamano2009-01-281-4/+123
|\
| * Simplify parsing branch switching events in reflogJunio C Hamano2009-01-211-6/+2
| * Introduce for_each_recent_reflog_ent().Junio C Hamano2009-01-191-1/+7
| * interpret_nth_last_branch(): plug small memleakJunio C Hamano2009-01-191-3/+7
| * Fix reflog parsing for a malformed branch switching entryJunio C Hamano2009-01-191-1/+1
| * Fix parsing of @{-1}@{1}Johannes Schindelin2009-01-191-1/+24
| * interpret_nth_last_branch(): avoid traversing the reflog twiceJunio C Hamano2009-01-191-24/+21
| * sha1_name: support @{-N} syntax in get_sha1()Thomas Rast2009-01-171-3/+13
| * sha1_name: tweak @{-N} lookupThomas Rast2009-01-171-24/+29
| * checkout: implement "@{-N}" shortcut name for N-th last branchJunio C Hamano2009-01-171-0/+78
* | Merge branch 'maint-1.6.0' into maintJunio C Hamano2009-01-271-1/+1
|\ \ | |/ |/|
| * get_sha1_basic(): fix invalid memory access, found by valgrindJohannes Schindelin2009-01-271-1/+1
View Lorry Controller Status