summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* refs.c: Write reflogs for notes just like for branch headsMichael J Gruber2010-03-292-1/+2
* t3301-notes: Test the creation of reflog entriesMichael J Gruber2010-03-291-0/+9
* Update draft release notes to 1.7.1Junio C Hamano2010-03-281-9/+10
* Merge branch 'cc/cherry-pick-ff'Junio C Hamano2010-03-288-18/+168
|\
| * revert: fix tiny memory leak in cherry-pick --ffJonathan Nieder2010-03-201-1/+2
| * rebase -i: use new --ff cherry-pick optionChristian Couder2010-03-201-12/+3
| * Documentation: describe new cherry-pick --ff optionChristian Couder2010-03-061-1/+5
| * cherry-pick: add tests for new --ff optionChristian Couder2010-03-061-0/+98
| * revert: add --ff option to allow fast forward when cherry-pickingJunio C Hamano2010-03-061-3/+40
| * builtin/merge: make checkout_fast_forward() non staticJunio C Hamano2010-03-062-1/+4
| * parse-options: add parse_options_concat() to concat optionsJunio C Hamano2010-03-062-0/+16
* | Merge branch 'sb/notes-parse-opt'Junio C Hamano2010-03-282-159/+382
|\ \
| * | notes: rework subcommands and parse optionsStephen Boyd2010-03-122-166/+394
* | | Merge branch 'maint'Junio C Hamano2010-03-281-0/+19
|\ \ \
| * | | Prepare for 1.7.0.4Junio C Hamano2010-03-282-1/+20
| * | | Merge branch 'cp/add-u-pathspec' into maintJunio C Hamano2010-03-283-9/+39
| |\ \ \
* | | | | rebase -i: make post-rewrite work for 'edit'Thomas Rast2010-03-282-2/+19
* | | | | Merge branch 'maint'Junio C Hamano2010-03-284-39/+55
|\ \ \ \ \ | |/ / / /
| * | | | t9350: fix careless use of "cd"Junio C Hamano2010-03-281-33/+38
| * | | | difftool: Fix '--gui' when diff.guitool is unconfiguredDavid Aguilar2010-03-282-5/+16
| * | | | fast-export: don't segfault when marks file cannot be openedSverre Rabbelier2010-03-281-1/+1
* | | | | imap-send: suppress warning about cleartext password with CRAM-MD5Chris Webb2010-03-281-3/+3
* | | | | 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
View Lorry Controller Status