summaryrefslogtreecommitdiff
path: root/sha1_name.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/interpret-branch-name-fix'Junio C Hamano2014-01-271-44/+73
|\
| * interpret_branch_name: find all possible @-marksjk/interpret-branch-name-fixJeff King2014-01-151-9/+11
| * interpret_branch_name: avoid @{upstream} past colonJeff King2014-01-151-0/+3
| * interpret_branch_name: always respect "namelen" parameterJeff King2014-01-151-7/+10
| * interpret_branch_name: rename "cp" variable to "at"Jeff King2014-01-151-5/+5
| * interpret_branch_name: factor out upstream handlingJeff King2014-01-151-31/+52
* | Merge branch 'br/sha1-name-40-hex-no-disambiguation'Junio C Hamano2014-01-131-2/+2
|\ \
| * | sha1_name: don't resolve refs when core.warnambiguousrefs is falsebr/sha1-name-40-hex-no-disambiguationBrodie Rao2014-01-071-2/+2
| |/
* | Merge branch 'cc/starts-n-ends-with'Junio C Hamano2013-12-171-8/+8
|\ \
| * | replace {pre,suf}fixcmp() with {starts,ends}_with()cc/starts-n-ends-withChristian Couder2013-12-051-8/+8
| |/
* | Merge branch 'jk/robustify-parse-commit'Junio C Hamano2013-12-051-2/+0
|\ \ | |/ |/|
| * assume parse_commit checks for NULL commitJeff King2013-10-241-2/+0
* | sha1-name: trivial style cleanupFelipe Contreras2013-10-311-1/+0
* | Merge branch 'fc/at-head'Junio C Hamano2013-09-201-4/+34
|\ \
| * | Add new @ shortcut for HEADfc/at-headFelipe Contreras2013-09-121-0/+28
| * | sha1-name: pass len argument to interpret_branch_name()Felipe Contreras2013-09-031-4/+6
| |/
* | Merge branch 'rh/peeling-tag-to-tag'Junio C Hamano2013-09-201-3/+5
|\ \
| * | peel_onion: do not assume length of x_type globalsrh/peeling-tag-to-tagJeff King2013-09-031-4/+4
| * | peel_onion(): add support for <rev>^{tag}Richard Hansen2013-09-031-0/+2
| |/
* | use 'commit-ish' instead of 'committish'Richard Hansen2013-09-041-3/+3
|/
* Revert "Add new @ shortcut for HEAD"Junio C Hamano2013-08-141-17/+0
* Rename advice.object_name_warning to objectNameWarningThomas Rast2013-07-311-1/+1
* Merge branch 'ob/typofixes'Junio C Hamano2013-07-241-1/+1
|\
| * typofix: in-code commentsOndřej Bílka2013-07-221-1/+1
* | Merge branch 'jk/cat-file-batch-optim'Junio C Hamano2013-07-241-6/+8
|\ \ | |/ |/|
| * cat-file: disable object/refname ambiguity check for batch modeJeff King2013-07-121-6/+8
| * Merge branch 'nd/warn-ambiguous-object-name' into jk/cat-file-batch-optimJunio C Hamano2013-07-121-2/+23
| |\
* | \ Merge branch 'nd/const-struct-cache-entry'Junio C Hamano2013-07-221-2/+2
|\ \ \
| * | | Convert "struct cache_entry *" to "const ..." wherever possiblend/const-struct-cache-entryNguyễn Thái Ngọc Duy2013-07-091-2/+2
* | | | Merge branch 'jc/t1512-fix'Junio C Hamano2013-07-111-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | get_short_sha1(): correctly disambiguate type-limited abbreviationJunio C Hamano2013-07-011-1/+1
* | | | Merge branch 'fc/at-head'Junio C Hamano2013-06-111-37/+66
|\ \ \ \
| * | | | sha1_name: compare variable with constant, not constant with variableFelipe Contreras2013-05-081-5/+7
| * | | | Add new @ shortcut for HEADFelipe Contreras2013-05-081-0/+17
| * | | | sha1_name: refactor reinterpret()Felipe Contreras2013-05-081-19/+23
| * | | | sha1_name: check @{-N} errors soonerRamkumar Ramachandra2013-05-081-5/+4
| * | | | sha1_name: reorganize get_sha1_basic()Felipe Contreras2013-05-081-11/+19
| * | | | sha1_name: don't waste cycles in the @-parsing loopRamkumar Ramachandra2013-05-081-1/+1
| * | | | sha1_name: remove unnecessary bracesFelipe Contreras2013-05-081-3/+2
| * | | | sha1_name: remove no-opFelipe Contreras2013-05-081-1/+1
| | |/ / | |/| |
* | | | Merge branch 'nd/warn-ambiguous-object-name'Junio C Hamano2013-06-111-2/+23
|\ \ \ \ | | |_|/ | |/| |
| * | | get_sha1: warn about full or short object names that look like refsNguyễn Thái Ngọc Duy2013-05-291-2/+23
* | | | Merge branch 'rr/die-on-missing-upstream'Junio C Hamano2013-06-111-7/+17
|\ \ \ \
| * | | | sha1_name: fix error message for @{<N>}, @{<date>}Ramkumar Ramachandra2013-06-021-1/+10
| * | | | sha1_name: fix error message for @{u}Ramkumar Ramachandra2013-05-221-6/+7
| | |/ / | |/| |
* | | | strbuf_branchname(): do not double-expand @{-1}~22Junio C Hamano2013-05-161-2/+6
|/ / /
* | | Merge branch 'jc/sha1-name-object-peeler'Junio C Hamano2013-04-031-1/+5
|\ \ \
| * | | peel_onion(): teach $foo^{object} peelerJunio C Hamano2013-03-311-1/+3
| * | | peel_onion: disambiguate to favor tree-ish when we know we want a tree-ishJunio C Hamano2013-03-311-0/+2
* | | | Merge branch 'jc/reflog-reverse-walk'Junio C Hamano2013-03-261-30/+18
|\ \ \ \ | |/ / / |/| | |
View Lorry Controller Status