summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Implement the rmdir_or_warn functionPeter Collingbourne2010-03-282-0/+9
* Generalise the unlink_or_warn functionPeter Collingbourne2010-03-281-5/+7
* Merge branch 'jh/maint-submodule-status-in-void'Junio C Hamano2010-03-241-1/+3
|\
| * git submodule summary: Handle HEAD as argument when on an unborn branchJens Lehmann2010-03-091-0/+1
| * submodule summary: do not fail before the first commitJunio C Hamano2010-03-031-1/+2
* | Merge branch 'tr/notes-display'Junio C Hamano2010-03-2425-33/+1366
|\ \
| * | git-notes(1): add a section about the meaning of historyThomas Rast2010-03-121-0/+14
| * | notes: track whether notes_trees were changed at allThomas Rast2010-03-123-0/+6
| * | notes: add shorthand --ref to override GIT_NOTES_REFThomas Rast2010-03-122-0/+21
| * | commit --amend: copy notes to the new commitThomas Rast2010-03-122-0/+18
| * | rebase: support automatic notes copyingThomas Rast2010-03-125-1/+50
| * | notes: implement helpers needed for note copying during rewriteThomas Rast2010-03-128-8/+385
| * | notes: implement 'git notes copy --stdin'Thomas Rast2010-03-125-2/+127
| * | rebase -i: invoke post-rewrite hookThomas Rast2010-03-122-1/+146
| * | rebase: invoke post-rewrite hookThomas Rast2010-03-123-0/+45
| * | commit --amend: invoke post-rewrite hookThomas Rast2010-03-123-1/+92
| * | Documentation: document post-rewrite hookThomas Rast2010-03-121-0/+34
| * | Support showing notes from more than one notes treeThomas Rast2010-03-1214-30/+437
| * | test-lib: unset GIT_NOTES_REF to stop it from influencing testsThomas Rast2010-03-121-0/+1
| * | Merge branch 'il/rev-glob'Junio C Hamano2010-02-239-19/+357
| |\ \
* | \ \ Merge branch 'jl/submodule-diff-dirtiness'Junio C Hamano2010-03-2410-43/+221
|\ \ \ \
| * | | | git status: ignoring untracked files must apply to submodules tooJens Lehmann2010-03-136-4/+17
| * | | | git status: Fix false positive "new commits" output for dirty submodulesJens Lehmann2010-03-123-9/+88
| * | | | Refactor dirty submodule detection in diff-lib.cJens Lehmann2010-03-122-18/+33
| * | | | git status: Show detailed dirty status of submodules in long formatJens Lehmann2010-03-085-12/+46
| * | | | git diff --submodule: Show detailed dirty status of submodulesJens Lehmann2010-03-045-21/+58
* | | | | Merge branch 'pb/log-first-parent-p-m'Junio C Hamano2010-03-2417-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-242-7/+10
|\ \ \ \ \ \
| * | | | | | refs: ref entry with NULL sha1 is can be a dangling symrefJunio C Hamano2010-03-152-7/+10
* | | | | | | Merge branch 'maint'Junio C Hamano2010-03-241-0/+3
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jc/color-attrs' into maintJunio C Hamano2010-03-243-14/+41
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jk/maint-add-ignored-dir' into maintJunio C Hamano2010-03-243-4/+103
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'bg/apply-fix-blank-at-eof' into maintJunio C Hamano2010-03-244-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-219-25/+13
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Git 1.7.0.3v1.7.0.3Junio C Hamano2010-03-213-10/+5
| * | | | | | | | | | Merge branch 'maint-1.6.6' into maintJunio C Hamano2010-03-214-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-211-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-131-0/+79