Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'th/diff-no-index-fixes' into maint | Junio C Hamano | 2012-07-11 | 5 | -24/+112 |
|\ | |||||
| * | diff-no-index: exit(1) if 'diff --quiet <repo file> <external file>' finds ch... | Tim Henigan | 2012-06-22 | 2 | -2/+73 |
| * | diff: handle relative paths in no-index | Jeff King | 2012-06-22 | 4 | -22/+39 |
* | | Merge branch 'nd/clone-single-fix' into maint | Junio C Hamano | 2012-07-11 | 2 | -3/+11 |
|\ \ | |||||
| * | | clone: fix ref selection in --single-branch --branch=xxx | Nguyễn Thái Ngọc Duy | 2012-06-22 | 2 | -3/+11 |
| |/ | |||||
* | | Merge branch 'jc/rev-list-simplify-merges-first-parent' into maint | Junio C Hamano | 2012-07-11 | 1 | -12/+29 |
|\ \ | |||||
| * | | revision: ignore side parents while running simplify-merges | Junio C Hamano | 2012-06-13 | 1 | -3/+11 |
| * | | revision: note the lack of free() in simplify_merges() | Junio C Hamano | 2012-06-08 | 1 | -7/+16 |
| * | | revision: "simplify" options imply topo-order sort | Junio C Hamano | 2012-06-08 | 1 | -2/+2 |
* | | | Merge branch 'hv/submodule-update-nuke-submodules' into maint | Junio C Hamano | 2012-07-11 | 1 | -6/+0 |
|\ \ \ | |||||
| * | | | update-index: allow overwriting existing submodule index entries | Heiko Voigt | 2012-06-11 | 1 | -6/+0 |
* | | | | Merge branch 'jk/diff-no-index-pager' into maint | Junio C Hamano | 2012-07-11 | 3 | -15/+22 |
|\ \ \ \ | |||||
| * | | | | do not run pager with diff --no-index --quiet | Jeff King | 2012-06-15 | 1 | -3/+3 |
| * | | | | fix pager.diff with diff --no-index | Jeff King | 2012-06-15 | 3 | -13/+20 |
| |/ / / | |||||
* | | | | Merge branch 'mm/verify-filename-fix' into maint | Junio C Hamano | 2012-07-11 | 8 | -10/+44 |
|\ \ \ \ | |||||
| * | | | | verify_filename(): ask the caller to chose the kind of diagnosis | Matthieu Moy | 2012-06-18 | 7 | -10/+33 |
| * | | | | sha1_name: do not trigger detailed diagnosis for file arguments | Matthieu Moy | 2012-06-18 | 2 | -1/+12 |
* | | | | | Merge branch 'cn/cherry-pick-range-docs' into maint | Junio C Hamano | 2012-07-11 | 2 | -1/+13 |
|\ \ \ \ \ | |||||
| * | | | | | git-cherry-pick.txt: clarify the use of revision range notation | Carlos Martín Nieto | 2012-06-15 | 1 | -1/+12 |
| * | | | | | Documentation: --no-walk is no-op if range is specified | Carlos Martín Nieto | 2012-06-15 | 1 | -0/+1 |
* | | | | | | Merge branch 'jc/ustar-checksum-is-unsigned' into maint | Junio C Hamano | 2012-07-11 | 1 | -3/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | archive: ustar header checksum is computed unsigned | Junio C Hamano | 2012-06-13 | 1 | -3/+3 |
* | | | | | | | Merge branch 'jc/bundle-complete-notice' into maint | Junio C Hamano | 2012-07-11 | 1 | -6/+10 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | tweak "bundle verify" of a complete history | Junio C Hamano | 2012-06-04 | 1 | -6/+10 |
* | | | | | | | | Merge branch 'jc/ls-files-i-dir' into maint | Junio C Hamano | 2012-07-11 | 6 | -10/+109 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | dir.c: make excluded() file scope static | Junio C Hamano | 2012-06-05 | 2 | -2/+1 |
| * | | | | | | | | unpack-trees.c: use path_excluded() in check_ok_to_remove() | Junio C Hamano | 2012-06-05 | 2 | -1/+11 |
| * | | | | | | | | builtin/add.c: use path_excluded() | Junio C Hamano | 2012-06-05 | 1 | -1/+5 |
| * | | | | | | | | path_excluded(): update API to less cache-entry centric | Junio C Hamano | 2012-06-05 | 3 | -15/+30 |
| * | | | | | | | | ls-files -i: micro-optimize path_excluded() | Junio C Hamano | 2012-06-03 | 1 | -0/+18 |
| * | | | | | | | | ls-files -i: pay attention to exclusion of leading paths | Junio C Hamano | 2012-06-03 | 3 | -6/+59 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'jc/request-pull-match-tagname' into maint | Junio C Hamano | 2012-07-11 | 1 | -7/+22 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | request-pull: really favor a matching tag | Junio C Hamano | 2012-06-01 | 1 | -7/+22 |
* | | | | | | | | | Merge branch 'maint' of git://github.com/git-l10n/git-po into maint | Junio C Hamano | 2012-07-02 | 1 | -562/+2270 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Update Swedish translation (1066t0f0u) | Peter Krefting | 2012-07-01 | 1 | -562/+2270 |
* | | | | | | | | | | git-submodule.sh: fix filename in comment. | Michał Górny | 2012-06-25 | 1 | -1/+1 |
* | | | | | | | | | | git-add--interactive.perl: Remove two unused variables | Thomas Badie | 2012-06-25 | 1 | -2/+0 |
* | | | | | | | | | | Documentation: Fix misspellings | Leila Muhtasib | 2012-06-22 | 5 | -6/+6 |
* | | | | | | | | | | Git 1.7.11.1v1.7.11.1 | Junio C Hamano | 2012-06-21 | 4 | -3/+13 |
* | | | | | | | | | | docs: always define git-relative-html-prefix attribute | Jeff King | 2012-06-20 | 1 | -0/+2 |
* | | | | | | | | | | git-commit-tree(1): update synopsis | Junio C Hamano | 2012-06-19 | 1 | -1/+1 |
* | | | | | | | | | | Documentation: spelling fixes | Miklos Vajna | 2012-06-19 | 6 | -6/+6 |
|/ / / / / / / / / | |||||
* | | | | | | | | | Git 1.7.11v1.7.11 | Junio C Hamano | 2012-06-17 | 3 | -10/+6 |
* | | | | | | | | | Sync with 1.7.10.5 | Junio C Hamano | 2012-06-17 | 2 | -1/+14 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
| * | | | | | | | | Git 1.7.10.5v1.7.10.5maint-1.7.10 | Junio C Hamano | 2012-06-17 | 4 | -3/+16 |
| * | | | | | | | | Do not autosquash in case of an implied interactive rebase | Vincent van Ravesteijn | 2012-06-17 | 1 | -0/+1 |
| * | | | | | | | | Merge branch 'js/maint-fast-export-mark-error' into maint | Junio C Hamano | 2012-06-17 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
* | | | | | | | | | Merge git://github.com/git-l10n/git-po | Junio C Hamano | 2012-06-15 | 2 | -703/+927 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | l10n: it.po: translate 212 new messages | Marco Paolone | 2012-06-14 | 2 | -703/+927 |
* | | | | | | | | | | Merge branch 'as/diff-shortstat-ignore-binary' | Junio C Hamano | 2012-06-15 | 2 | -1/+13 |
|\ \ \ \ \ \ \ \ \ \ |