summaryrefslogtreecommitdiff
path: root/sha1_name.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/broken-ref-dwim-fix'Junio C Hamano2011-10-211-85/+0
|\
| * refs.c: move dwim_ref()/dwim_log() from sha1_name.cJunio C Hamano2011-10-121-85/+0
* | Merge branch 'mh/check-ref-format-3'Junio C Hamano2011-10-101-2/+2
|\ \ | |/
| * Change check_ref_format() to take a flags argumentMichael Haggerty2011-10-051-2/+2
* | Allow git merge ":/<pattern>"jc/want-commitJunio C Hamano2011-09-151-6/+0
|/
* Merge branch 'jc/magic-pathspec'Junio C Hamano2011-05-231-8/+9
|\
| * fix overslow :/no-such-string-ever-existed diagnosticsJunio C Hamano2011-05-101-8/+9
| * fix overstrict :<path> diagnosisJunio C Hamano2011-05-101-1/+1
* | sha1_name: Suggest commit:./file for path in subdirMichael J Gruber2011-04-031-4/+7
|/
* Revert "core.abbrevguard: Ensure short object names stay unique a bit longer"Junio C Hamano2011-03-101-3/+1
* Merge branch 'tf/commit-list-prefix'Junio C Hamano2010-12-221-1/+1
|\
| * commit: Add commit_list prefix in two function names.Thiago Farina2010-11-291-1/+1
* | Merge branch 'nd/oneline-sha1-name-from-specific-ref'Junio C Hamano2010-12-211-28/+55
|\ \
| * | get_sha1: handle special case $commit^{/}Nguyễn Thái Ngọc Duy2010-12-161-0/+7
| * | get_sha1: support $commit^{/regex} syntaxNguyễn Thái Ngọc Duy2010-12-141-11/+26
| * | get_sha1_oneline: make callers prepare the commit list to traverseNguyễn Thái Ngọc Duy2010-12-121-8/+11
| * | get_sha1_oneline: fix lifespan rule of temp_commit_buffer variableJunio C Hamano2010-12-121-11/+13
* | | 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
| |/