aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* whitespace: replumb ws_fix_copy to take a strbuf *dst instead of char *dstChris Webb2010-04-04
* whitespace: tests for git-diff --check with tab-in-indent error classChris Webb2010-04-04
* whitespace: add tab-in-indent error classChris Webb2010-04-02
* whitespace: we cannot "catch all errors known to git" anymoreJunio C Hamano2010-04-02
* Merge branch 'maint'Junio C Hamano2010-03-29
|\
| * format-patch: Squelch 'fatal: Not a range." errorKevin Ballard2010-03-29
* | Update draft release notes to 1.7.1Junio C Hamano2010-03-28
* | Merge branch 'cc/cherry-pick-ff'Junio C Hamano2010-03-28
|\ \
| * | revert: fix tiny memory leak in cherry-pick --ffJonathan Nieder2010-03-20
| * | rebase -i: use new --ff cherry-pick optionChristian Couder2010-03-20
| * | Documentation: describe new cherry-pick --ff optionChristian Couder2010-03-06
| * | cherry-pick: add tests for new --ff optionChristian Couder2010-03-06
| * | revert: add --ff option to allow fast forward when cherry-pickingJunio C Hamano2010-03-06
| * | builtin/merge: make checkout_fast_forward() non staticJunio C Hamano2010-03-06
| * | parse-options: add parse_options_concat() to concat optionsJunio C Hamano2010-03-06
* | | Merge branch 'sb/notes-parse-opt'Junio C Hamano2010-03-28
|\ \ \
| * | | notes: rework subcommands and parse optionsStephen Boyd2010-03-12
* | | | Merge branch 'maint'Junio C Hamano2010-03-28
|\ \ \ \ | | |_|/ | |/| |
| * | | Prepare for 1.7.0.4Junio C Hamano2010-03-28
| * | | Merge branch 'cp/add-u-pathspec' into maintJunio C Hamano2010-03-28
| |\ \ \
* | | | | rebase -i: make post-rewrite work for 'edit'Thomas Rast2010-03-28
* | | | | Merge branch 'maint'Junio C Hamano2010-03-28
|\ \ \ \ \ | |/ / / /
| * | | | t9350: fix careless use of "cd"Junio C Hamano2010-03-28
| * | | | difftool: Fix '--gui' when diff.guitool is unconfiguredDavid Aguilar2010-03-28
| * | | | fast-export: don't segfault when marks file cannot be openedSverre Rabbelier2010-03-28
* | | | | imap-send: suppress warning about cleartext password with CRAM-MD5Chris Webb2010-03-28
* | | | | Merge branch 'jh/maint-submodule-status-in-void'Junio C Hamano2010-03-24
|\ \ \ \ \
| * | | | | git submodule summary: Handle HEAD as argument when on an unborn branchJens Lehmann2010-03-09
| * | | | | submodule summary: do not fail before the first commitJunio C Hamano2010-03-03
* | | | | | Merge branch 'tr/notes-display'Junio C Hamano2010-03-24
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | git-notes(1): add a section about the meaning of historyThomas Rast2010-03-12
| * | | | | notes: track whether notes_trees were changed at allThomas Rast2010-03-12
| * | | | | notes: add shorthand --ref to override GIT_NOTES_REFThomas Rast2010-03-12
| * | | | | commit --amend: copy notes to the new commitThomas Rast2010-03-12
| * | | | | rebase: support automatic notes copyingThomas Rast2010-03-12
| * | | | | notes: implement helpers needed for note copying during rewriteThomas Rast2010-03-12
| * | | | | notes: implement 'git notes copy --stdin'Thomas Rast2010-03-12
| * | | | | rebase -i: invoke post-rewrite hookThomas Rast2010-03-12
| * | | | | rebase: invoke post-rewrite hookThomas Rast2010-03-12
| * | | | | commit --amend: invoke post-rewrite hookThomas Rast2010-03-12
| * | | | | Documentation: document post-rewrite hookThomas Rast2010-03-12
| * | | | | Support showing notes from more than one notes treeThomas Rast2010-03-12
| * | | | | test-lib: unset GIT_NOTES_REF to stop it from influencing testsThomas Rast2010-03-12
| * | | | | Merge branch 'il/rev-glob'Junio C Hamano2010-02-23
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'jl/submodule-diff-dirtiness'Junio C Hamano2010-03-24
|\ \ \ \ \ \ \
| * | | | | | | git status: ignoring untracked files must apply to submodules tooJens Lehmann2010-03-13
| * | | | | | | git status: Fix false positive "new commits" output for dirty submodulesJens Lehmann2010-03-12
| * | | | | | | Refactor dirty submodule detection in diff-lib.cJens Lehmann2010-03-12
| * | | | | | | git status: Show detailed dirty status of submodules in long formatJens Lehmann2010-03-08
| * | | | | | | git diff --submodule: Show detailed dirty status of submodulesJens Lehmann2010-03-04