summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | rebase -i: invoke post-rewrite hookThomas Rast2010-03-132-1/+146
| * | | | | | rebase: invoke post-rewrite hookThomas Rast2010-03-133-0/+45
| * | | | | | commit --amend: invoke post-rewrite hookThomas Rast2010-03-133-1/+92
| * | | | | | Documentation: document post-rewrite hookThomas Rast2010-03-131-0/+34
| * | | | | | Support showing notes from more than one notes treeThomas Rast2010-03-1314-30/+437
| * | | | | | test-lib: unset GIT_NOTES_REF to stop it from influencing testsThomas Rast2010-03-131-0/+1
| * | | | | | Merge branch 'il/rev-glob'Junio C Hamano2010-02-239-19/+357
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge branch 'jl/submodule-diff-dirtiness'Junio C Hamano2010-03-2510-43/+221
|\ \ \ \ \ \ \ \
| * | | | | | | | git status: ignoring untracked files must apply to submodules tooJens Lehmann2010-03-146-4/+17
| * | | | | | | | git status: Fix false positive "new commits" output for dirty submodulesJens Lehmann2010-03-133-9/+88
| * | | | | | | | Refactor dirty submodule detection in diff-lib.cJens Lehmann2010-03-132-18/+33
| * | | | | | | | git status: Show detailed dirty status of submodules in long formatJens Lehmann2010-03-095-12/+46
| * | | | | | | | git diff --submodule: Show detailed dirty status of submodulesJens Lehmann2010-03-055-21/+58
* | | | | | | | | Merge branch 'pb/log-first-parent-p-m'Junio C Hamano2010-03-2517-30/+653
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | show --first-parent/-m: do not default to --ccJunio C Hamano2010-03-094-3/+134
| * | | | | | | | | show -c: show patch textJunio C Hamano2010-03-096-8/+62
| * | | | | | | | | revision: introduce setup_revision_optJunio C Hamano2010-03-095-16/+44
| * | | | | | | | | t4013: add tests for log -p -m --first-parentJunio C Hamano2010-03-094-0/+381
| * | | | | | | | | git log -p -m: document -m and honor --first-parentPetr Baudis2010-02-124-3/+32
* | | | | | | | | | Merge branch 'jc/maint-refs-dangling'Junio C Hamano2010-03-252-7/+10
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | refs: ref entry with NULL sha1 is can be a dangling symrefJunio C Hamano2010-03-162-7/+10
* | | | | | | | | | Merge branch 'maint'Junio C Hamano2010-03-251-0/+3
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | |
| * | | | | | | | | Merge branch 'jc/color-attrs' into maintJunio C Hamano2010-03-253-14/+41
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jk/maint-add-ignored-dir' into maintJunio C Hamano2010-03-253-4/+103
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'bg/apply-fix-blank-at-eof' into maintJunio C Hamano2010-03-254-40/+450
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Documentation: explain the meaning of "-g" in git-describe outputMarkus Heidelberg2010-03-241-0/+3
* | | | | | | | | | | | | Sync with Git 1.7.0.3Junio C Hamano2010-03-229-25/+13
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Git 1.7.0.3v1.7.0.3Junio C Hamano2010-03-223-10/+5
| * | | | | | | | | | | | Merge branch 'maint-1.6.6' into maintJunio C Hamano2010-03-224-14/+6
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Documentation/git-clone: Transform description list into item listMichael J Gruber2010-03-211-5/+5
| | * | | | | | | | | | | | Documentation/urls: Remove spurious example markersMichael J Gruber2010-03-211-6/+0
| | * | | | | | | | | | | | Documentation/gitdiffcore: Remove misleading date in headingMichael J Gruber2010-03-211-1/+1
| | * | | | | | | | | | | | Documentation/git-reflog: Fix formatting of command listsMichael J Gruber2010-03-211-2/+0
| * | | | | | | | | | | | | .mailmap: Map the the first submissions of MJG by e-mailMichael J Gruber2010-03-221-0/+1
* | | | | | | | | | | | | | Update draft release notes to 1.7.1Junio C Hamano2010-03-201-2/+34
* | | | | | | | | | | | | | Merge branch 'jk/maint-add-ignored-dir'Junio C Hamano2010-03-203-4/+103
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | tests for "git add ignored-dir/file" without -fJunio C Hamano2010-03-141-0/+79
| * | | | | | | | | | | | | dir: fix COLLECT_IGNORED on excluded prefixesJeff King2010-03-141-2/+18
| * | | | | | | | | | | | | t0050: mark non-working test as suchJunio C Hamano2010-03-141-2/+6
* | | | | | | | | | | | | | Merge branch 'ml/color-grep'Junio C Hamano2010-03-206-43/+123
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | grep: Colorize selected, context, and function linesMark Lodato2010-03-084-2/+27
| * | | | | | | | | | | | | | grep: Colorize filename, line number, and separatorMark Lodato2010-03-084-34/+78
| * | | | | | | | | | | | | | Add GIT_COLOR_BOLD_* and GIT_COLOR_BG_*Mark Lodato2010-03-073-7/+18
* | | | | | | | | | | | | | | Merge branch 'jc/color-attrs'Junio C Hamano2010-03-203-14/+41
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | color: allow multiple attributesJunio C Hamano2010-03-073-14/+41
* | | | | | | | | | | | | | | Merge branch 'cc/reset-keep'Junio C Hamano2010-03-205-20/+229
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Documentation: improve description of "git reset --keep"Junio C Hamano2010-03-091-3/+6
| * | | | | | | | | | | | | | | reset: disallow using --keep when there are unmerged entriesChristian Couder2010-03-074-22/+28
| * | | | | | | | | | | | | | | reset: disallow "reset --keep" outside a work treeChristian Couder2010-03-072-9/+18
| * | | | | | | | | | | | | | | Documentation: reset: describe new "--keep" optionChristian Couder2010-03-071-1/+48