summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'th/diff-no-index-fixes' into maintJunio C Hamano2012-07-115-24/+112
|\
| * diff-no-index: exit(1) if 'diff --quiet <repo file> <external file>' finds ch...Tim Henigan2012-06-222-2/+73
| * diff: handle relative paths in no-indexJeff King2012-06-224-22/+39
* | Merge branch 'nd/clone-single-fix' into maintJunio C Hamano2012-07-112-3/+11
|\ \
| * | clone: fix ref selection in --single-branch --branch=xxxNguyễn Thái Ngọc Duy2012-06-222-3/+11
| |/
* | Merge branch 'jc/rev-list-simplify-merges-first-parent' into maintJunio C Hamano2012-07-111-12/+29
|\ \
| * | revision: ignore side parents while running simplify-mergesJunio C Hamano2012-06-131-3/+11
| * | revision: note the lack of free() in simplify_merges()Junio C Hamano2012-06-081-7/+16
| * | revision: "simplify" options imply topo-order sortJunio C Hamano2012-06-081-2/+2
* | | Merge branch 'hv/submodule-update-nuke-submodules' into maintJunio C Hamano2012-07-111-6/+0
|\ \ \
| * | | update-index: allow overwriting existing submodule index entriesHeiko Voigt2012-06-111-6/+0
* | | | Merge branch 'jk/diff-no-index-pager' into maintJunio C Hamano2012-07-113-15/+22
|\ \ \ \
| * | | | do not run pager with diff --no-index --quietJeff King2012-06-151-3/+3
| * | | | fix pager.diff with diff --no-indexJeff King2012-06-153-13/+20
| |/ / /
* | | | Merge branch 'mm/verify-filename-fix' into maintJunio C Hamano2012-07-118-10/+44
|\ \ \ \
| * | | | verify_filename(): ask the caller to chose the kind of diagnosisMatthieu Moy2012-06-187-10/+33
| * | | | sha1_name: do not trigger detailed diagnosis for file argumentsMatthieu Moy2012-06-182-1/+12
* | | | | Merge branch 'cn/cherry-pick-range-docs' into maintJunio C Hamano2012-07-112-1/+13
|\ \ \ \ \
| * | | | | git-cherry-pick.txt: clarify the use of revision range notationCarlos Martín Nieto2012-06-151-1/+12
| * | | | | Documentation: --no-walk is no-op if range is specifiedCarlos Martín Nieto2012-06-151-0/+1
* | | | | | Merge branch 'jc/ustar-checksum-is-unsigned' into maintJunio C Hamano2012-07-111-3/+3
|\ \ \ \ \ \
| * | | | | | archive: ustar header checksum is computed unsignedJunio C Hamano2012-06-131-3/+3
* | | | | | | Merge branch 'jc/bundle-complete-notice' into maintJunio C Hamano2012-07-111-6/+10
|\ \ \ \ \ \ \
| * | | | | | | tweak "bundle verify" of a complete historyJunio C Hamano2012-06-041-6/+10
* | | | | | | | Merge branch 'jc/ls-files-i-dir' into maintJunio C Hamano2012-07-116-10/+109
|\ \ \ \ \ \ \ \
| * | | | | | | | dir.c: make excluded() file scope staticJunio C Hamano2012-06-052-2/+1
| * | | | | | | | unpack-trees.c: use path_excluded() in check_ok_to_remove()Junio C Hamano2012-06-052-1/+11
| * | | | | | | | builtin/add.c: use path_excluded()Junio C Hamano2012-06-051-1/+5
| * | | | | | | | path_excluded(): update API to less cache-entry centricJunio C Hamano2012-06-053-15/+30
| * | | | | | | | ls-files -i: micro-optimize path_excluded()Junio C Hamano2012-06-031-0/+18
| * | | | | | | | ls-files -i: pay attention to exclusion of leading pathsJunio C Hamano2012-06-033-6/+59
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'jc/request-pull-match-tagname' into maintJunio C Hamano2012-07-111-7/+22
|\ \ \ \ \ \ \ \
| * | | | | | | | request-pull: really favor a matching tagJunio C Hamano2012-06-011-7/+22
* | | | | | | | | Merge branch 'maint' of git://github.com/git-l10n/git-po into maintJunio C Hamano2012-07-021-562/+2270
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update Swedish translation (1066t0f0u)Peter Krefting2012-07-011-562/+2270
* | | | | | | | | | git-submodule.sh: fix filename in comment.Michał Górny2012-06-251-1/+1
* | | | | | | | | | git-add--interactive.perl: Remove two unused variablesThomas Badie2012-06-251-2/+0
* | | | | | | | | | Documentation: Fix misspellingsLeila Muhtasib2012-06-225-6/+6
* | | | | | | | | | Git 1.7.11.1v1.7.11.1Junio C Hamano2012-06-214-3/+13
* | | | | | | | | | docs: always define git-relative-html-prefix attributeJeff King2012-06-201-0/+2
* | | | | | | | | | git-commit-tree(1): update synopsisJunio C Hamano2012-06-191-1/+1
* | | | | | | | | | Documentation: spelling fixesMiklos Vajna2012-06-196-6/+6
|/ / / / / / / / /
* | | | | | | | | Git 1.7.11v1.7.11Junio C Hamano2012-06-173-10/+6
* | | | | | | | | Sync with 1.7.10.5Junio C Hamano2012-06-172-1/+14
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Git 1.7.10.5v1.7.10.5maint-1.7.10Junio C Hamano2012-06-174-3/+16
| * | | | | | | | Do not autosquash in case of an implied interactive rebaseVincent van Ravesteijn2012-06-171-0/+1
| * | | | | | | | Merge branch 'js/maint-fast-export-mark-error' into maintJunio C Hamano2012-06-171-1/+1
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge git://github.com/git-l10n/git-poJunio C Hamano2012-06-152-703/+927
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | l10n: it.po: translate 212 new messagesMarco Paolone2012-06-142-703/+927
* | | | | | | | | | Merge branch 'as/diff-shortstat-ignore-binary'Junio C Hamano2012-06-152-1/+13
|\ \ \ \ \ \ \ \ \ \