summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Git 1.7.12.1v1.7.12.1Junio C Hamano2012-09-183-2/+14
* Merge branch 'er/doc-fast-import-done' into maintJunio C Hamano2012-09-181-1/+7
|\
| * fast-import: document the --done optionEric S. Raymond2012-08-221-1/+7
* | Merge branch 'jk/config-warn-on-inaccessible-paths' into maintJunio C Hamano2012-09-186-10/+34
|\ \
| * | attr: failure to open a .gitattributes file is OK with ENOTDIRJunio C Hamano2012-09-131-1/+1
| * | warn_on_inaccessible(): a helper to warn on inaccessible pathsJunio C Hamano2012-08-214-3/+11
| * | attr: warn on inaccessible attribute filesJeff King2012-08-211-1/+4
| * | gitignore: report access errors of exclude filesJeff King2012-08-211-2/+4
| * | config: warn on inaccessible filesJeff King2012-08-214-7/+18
* | | Doc: Improve shallow depth wordingPhilip Oakley2012-09-181-2/+4
* | | Documentation/git-filter-branch: Move note about effect of removing commitsAndreas Schwab2012-09-181-10/+9
* | | t/perf: add "trash directory" to .gitignoreRamkumar Ramachandra2012-09-171-2/+3
* | | Add missing -z to git check-attr usage text for consistency with man pageAdam Spiers2012-09-171-1/+1
* | | git-jump: ignore (custom) prefix in diff modeMischa POSLAWSKY2012-09-171-2/+2
* | | Documentation: indent-with-non-tab uses "equivalent tabs" not 8Wesley J. Landaker2012-09-171-2/+3
* | | completion: add --no-edit to git-commitYacine Belkadi2012-09-161-1/+2
* | | Draft release notes to 1.7.12.1Junio C Hamano2012-09-141-47/+69
* | | Merge branch 'sb/send-email-reconfirm-fix' into maintJunio C Hamano2012-09-141-2/+4
|\ \ \
| * | | send-email: initial_to and initial_reply_to are both optionalStephen Boyd2012-09-061-2/+4
* | | | Merge branch 'jc/send-email-reconfirm' into maintJunio C Hamano2012-09-141-3/+13
|\ \ \ \ | |/ / /
| * | | send-email: validate & reconfirm interactive responsesJunio C Hamano2012-08-141-3/+13
* | | | Merge branch 'mz/cherry-pick-cmdline-order' into maintJunio C Hamano2012-09-148-11/+60
|\ \ \ \
| * | | | cherry-pick/revert: respect order of revisions to pickMartin von Zweigbergk2012-08-303-3/+7
| * | | | demonstrate broken 'git cherry-pick three one two'Martin von Zweigbergk2012-08-301-0/+15
| * | | | teach log --no-walk=unsorted, which avoids sortingMartin von Zweigbergk2012-08-306-9/+40
* | | | | Sync with 1.7.11.7Junio C Hamano2012-09-1413-14/+147
|\ \ \ \ \
| * | | | | Git 1.7.11.7v1.7.11.7maint-1.7.11Junio C Hamano2012-09-144-3/+50
| * | | | | Merge branch 'jk/maint-quiet-is-synonym-to-s-in-log' into maint-1.7.11Junio C Hamano2012-09-142-1/+13
| |\ \ \ \ \
| | * | | | | log: fix --quiet synonym for -sJeff King2012-08-282-1/+13
| * | | | | | Merge branch 'jc/maint-ident-missing-human-name' into maint-1.7.11Junio C Hamano2012-09-142-3/+20
| |\ \ \ \ \ \
| | * | | | | | split_ident_line(): make best effort when parsing author/committer lineJunio C Hamano2012-08-312-3/+20
| | |/ / / / /
| * | | | | | Merge branch 'rj/test-regex' into maint-1.7.11Junio C Hamano2012-09-144-0/+27
| |\ \ \ \ \ \
| | * | | | | | test-regex: Add a test to check for a bug in the regex routinesRamsay Jones2012-09-024-0/+27
| * | | | | | | Merge branch 'da/gitk-reload-tag-contents' into maint-1.7.11Junio C Hamano2012-09-141-8/+9
| |\ \ \ \ \ \ \
| | * | | | | | | gitk: Rename 'tagcontents' to 'cached_tagcontent'David Aguilar2012-09-081-7/+7
| | * | | | | | | gitk: Teach "Reread references" to reload tagsDavid Aguilar2012-09-081-1/+2
| | * | | | | | | gitk: Avoid Meta1-F5Felipe Contreras2012-04-251-2/+2
| * | | | | | | | Merge branch 'jc/maint-checkout-fileglob-doc' into maint-1.7.11Junio C Hamano2012-09-142-1/+30
| |\ \ \ \ \ \ \ \
| | * | | | | | | | gitcli: contrast wildcard given to shell and to gitJunio C Hamano2012-09-101-0/+17
| | * | | | | | | | gitcli: formatting fixJunio C Hamano2012-09-101-1/+1
| | * | | | | | | | Document file-glob for "git checkout -- '*.c'"Junio C Hamano2012-09-041-0/+12
* | | | | | | | | | Further merging in preparation for 1.7.12.1Junio C Hamano2012-09-121-0/+26
* | | | | | | | | | Merge branch 'maint-1.7.11' into maintJunio C Hamano2012-09-1219-162/+321
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge branch 'jc/apply-binary-p0' into maint-1.7.11Junio C Hamano2012-09-122-46/+76
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | apply: compute patch->def_name correctly under -p0Junio C Hamano2012-08-242-46/+76
| * | | | | | | | | | Merge branch 'jc/dotdot-is-parent-directory' into maint-1.7.11Junio C Hamano2012-09-125-4/+56
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | specifying ranges: we did not mean to make ".." an empty setJunio C Hamano2012-08-235-4/+56
| * | | | | | | | | | | Merge branch 'jc/maint-doc-checkout-b-always-takes-branch-name' into maint-1....Junio C Hamano2012-09-121-3/+3
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | doc: "git checkout -b/-B/--orphan" always takes a branch nameJunio C Hamano2012-08-261-3/+3
| | | |_|_|_|/ / / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge branch 'jk/maint-http-half-auth-push' into maint-1.7.11Junio C Hamano2012-09-129-106/+171
| |\ \ \ \ \ \ \ \ \ \ \