| Commit message (Expand) | Author | Age | Files | Lines |
* | i18n: mark @{upstream} error messages for translation | Zbigniew Jędrzejewski-Szmek | 2012-04-15 | 1 | -4/+4 |
* | Be more specific if upstream branch is not tracked | Zbigniew Jędrzejewski-Szmek | 2012-04-15 | 1 | -1/+6 |
* | Provide better message for barnhc_wiht_tpyo@{u} | Zbigniew Jędrzejewski-Szmek | 2012-04-15 | 1 | -1/+4 |
* | Provide branch name in error message when using @{u} | Zbigniew Jędrzejewski-Szmek | 2012-04-15 | 1 | -4/+8 |
* | Merge branch 'jc/broken-ref-dwim-fix' | Junio C Hamano | 2011-10-21 | 1 | -85/+0 |
|\ |
|
| * | refs.c: move dwim_ref()/dwim_log() from sha1_name.c | Junio C Hamano | 2011-10-12 | 1 | -85/+0 |
* | | Merge branch 'mh/check-ref-format-3' | Junio C Hamano | 2011-10-10 | 1 | -2/+2 |
|\ \
| |/ |
|
| * | Change check_ref_format() to take a flags argument | Michael Haggerty | 2011-10-05 | 1 | -2/+2 |
* | | Allow git merge ":/<pattern>"jc/want-commit | Junio C Hamano | 2011-09-15 | 1 | -6/+0 |
|/ |
|
* | Merge branch 'jc/magic-pathspec' | Junio C Hamano | 2011-05-23 | 1 | -8/+9 |
|\ |
|
| * | fix overslow :/no-such-string-ever-existed diagnostics | Junio C Hamano | 2011-05-10 | 1 | -8/+9 |
| * | fix overstrict :<path> diagnosis | Junio C Hamano | 2011-05-10 | 1 | -1/+1 |
* | | sha1_name: Suggest commit:./file for path in subdir | Michael J Gruber | 2011-04-03 | 1 | -4/+7 |
|/ |
|
* | Revert "core.abbrevguard: Ensure short object names stay unique a bit longer" | Junio C Hamano | 2011-03-10 | 1 | -3/+1 |
* | Merge branch 'tf/commit-list-prefix' | Junio C Hamano | 2010-12-22 | 1 | -1/+1 |
|\ |
|
| * | commit: Add commit_list prefix in two function names. | Thiago Farina | 2010-11-29 | 1 | -1/+1 |
* | | Merge branch 'nd/oneline-sha1-name-from-specific-ref' | Junio C Hamano | 2010-12-21 | 1 | -28/+55 |
|\ \ |
|
| * | | get_sha1: handle special case $commit^{/} | Nguyễn Thái Ngọc Duy | 2010-12-16 | 1 | -0/+7 |
| * | | get_sha1: support $commit^{/regex} syntax | Nguyễn Thái Ngọc Duy | 2010-12-14 | 1 | -11/+26 |
| * | | get_sha1_oneline: make callers prepare the commit list to traverse | Nguyễn Thái Ngọc Duy | 2010-12-12 | 1 | -8/+11 |
| * | | get_sha1_oneline: fix lifespan rule of temp_commit_buffer variable | Junio C Hamano | 2010-12-12 | 1 | -11/+13 |
* | | | Merge branch 'nd/extended-sha1-relpath' | Junio C Hamano | 2010-12-16 | 1 | -2/+35 |
|\ \ \
| |/ /
|/| | |
|
| * | | get_sha1: teach ":$n:<path>" the same relative path logic | Junio C Hamano | 2010-12-09 | 1 | -6/+8 |
| * | | get_sha1: support relative path ":path" syntax | Nguyễn Thái Ngọc Duy | 2010-12-07 | 1 | -3/+34 |
* | | | Merge branch 'jn/thinner-wrapper' | Junio C Hamano | 2010-12-03 | 1 | -0/+18 |
|\ \ \ |
|
| * | | | strbuf: move strbuf_branchname to sha1_name.c | Jonathan Nieder | 2010-11-10 | 1 | -0/+18 |
| |/ / |
|
* | | | Merge branch 'jc/abbrev-guard' | Junio C Hamano | 2010-12-03 | 1 | -1/+3 |
|\ \ \
| |_|/
|/| | |
|
| * | | core.abbrevguard: Ensure short object names stay unique a bit longer | Junio C Hamano | 2010-10-28 | 1 | -1/+3 |
| |/ |
|
* | | Merge branch 'ks/no-textconv-symlink' | Junio C Hamano | 2010-11-17 | 1 | -0/+2 |
|\ \
| |/
|/| |
|
| * | blame,cat-file --textconv: Don't assume mode is ``S_IFREF | 0664'' | Kirill Smelkov | 2010-09-29 | 1 | -0/+2 |
| * | Merge branch 'jc/sha1-name-find-fix' into maint | Junio C Hamano | 2010-08-19 | 1 | -10/+11 |
| |\ |
|
* | | | update comment and documentation for :/foo syntax | Matthieu Moy | 2010-09-27 | 1 | -0/+1 |
* | | | Merge branch 'js/maint-reflog-beyond-horizon' | Junio C Hamano | 2010-09-03 | 1 | -9/+9 |
|\ \ \ |
|
| * | | | sha1_name.c: use warning in preference to fprintf(stderr | Jon Seymour | 2010-08-24 | 1 | -5/+4 |
| * | | | rev-parse: exit with non-zero status if ref@{n} is not valid. | Jon Seymour | 2010-08-24 | 1 | -4/+5 |
| |/ / |
|
* | | | Merge branch 'jc/sha1-name-find-fix' | Junio C Hamano | 2010-08-12 | 1 | -10/+11 |
|\ \ \
| |/ /
|/| /
| |/ |
|
| * | sha1_name.c: fix parsing of ":/token" syntax | Junio C Hamano | 2010-08-02 | 1 | -10/+11 |
* | | Merge branch 'cp/textconv-cat-file' | Junio C Hamano | 2010-06-27 | 1 | -5/+26 |
|\ \ |
|
| * | | sha1_name: add get_sha1_with_context() | Clément Poulain | 2010-06-18 | 1 | -5/+26 |
| |/ |
|
* | | Make :/ accept a regex rather than a fixed pattern | Linus Torvalds | 2010-06-14 | 1 | -3/+9 |
|/ |
|
* | sha1_name: fix segfault caused by invalid index access | Markus Heidelberg | 2010-02-28 | 1 | -14/+18 |
* | Merge branch 'maint-1.6.6' into maint | Junio C Hamano | 2010-02-16 | 1 | -2/+1 |
|\ |
|
| * | Merge branch 'maint-1.6.5' into maint-1.6.6 | Junio C Hamano | 2010-02-16 | 1 | -2/+1 |
| |\ |
|
| | * | dwim_ref: fix dangling symref warning | Jeff King | 2010-02-16 | 1 | -2/+1 |
* | | | reject @{-1} not at beginning of object name | Jeff King | 2010-01-28 | 1 | -0/+4 |
* | | | fix parsing of @{-1}@{u} combination | Jeff King | 2010-01-28 | 1 | -2/+22 |
* | | | Merge branch 'jc/maint-reflog-bad-timestamp' | Junio C Hamano | 2010-01-27 | 1 | -1/+4 |
|\ \ \
| |/ / |
|
| * | | Update @{bogus.timestamp} fix not to die() | Junio C Hamano | 2010-01-27 | 1 | -2/+2 |
| * | | approxidate_careful() reports errorneous date string | Junio C Hamano | 2010-01-26 | 1 | -1/+4 |
| |/ |
|
* | | Merge branch 'js/refer-upstream' | Junio C Hamano | 2010-01-22 | 1 | -13/+78 |
|\ \ |
|