|
|
@ -39,14 +39,23 @@ The "-q" option to "git diff-files", which does *NOT* mean "quiet", |
|
|
|
has been removed (it told Git to ignore deletion, which you can do |
|
|
|
has been removed (it told Git to ignore deletion, which you can do |
|
|
|
with "git diff-files --diff-filter=d"). |
|
|
|
with "git diff-files --diff-filter=d"). |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
"git request-pull" lost a few "heuristics" that often led to mistakes. |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Updates since v1.9 series |
|
|
|
Updates since v1.9 series |
|
|
|
------------------------- |
|
|
|
------------------------- |
|
|
|
|
|
|
|
|
|
|
|
Foreign interfaces, subsystems and ports. |
|
|
|
UI, Workflows & Features |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* "git tag --list" output can be sorted using "version sort" with |
|
|
|
|
|
|
|
"--sort=version:refname". |
|
|
|
|
|
|
|
|
|
|
|
UI, Workflows & Features |
|
|
|
* Discard the accumulated "heuristics" to guess from which branch the |
|
|
|
|
|
|
|
result wants to be pulled from and make sure what the end user |
|
|
|
|
|
|
|
specified is not second-guessed by "git request-pull", to avoid |
|
|
|
|
|
|
|
mistakes. When you pushed out your 'master' branch to your public |
|
|
|
|
|
|
|
repository as 'for-linus', use the new "master:for-linus" syntax to |
|
|
|
|
|
|
|
denote the branch to be pulled. |
|
|
|
|
|
|
|
|
|
|
|
* "git grep" learned to behave in a way similar to native grep when |
|
|
|
* "git grep" learned to behave in a way similar to native grep when |
|
|
|
"-h" (no header) and "-c" (count) options are given. |
|
|
|
"-h" (no header) and "-c" (count) options are given. |
|
|
@ -144,6 +153,21 @@ Unless otherwise noted, all the fixes since v1.9 in the maintenance |
|
|
|
track are contained in this release (see the maintenance releases' |
|
|
|
track are contained in this release (see the maintenance releases' |
|
|
|
notes for details). |
|
|
|
notes for details). |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* Serving objects from a shallow repository needs to write a |
|
|
|
|
|
|
|
new file to hold the temporary shallow boundaries but it was not |
|
|
|
|
|
|
|
cleaned when we exit due to die() or a signal. |
|
|
|
|
|
|
|
(merge 7839632 jk/shallow-update-fix later to maint). |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* When "git stash pop" stops after failing to apply the stash |
|
|
|
|
|
|
|
(e.g. due to conflicting changes), the stash is not dropped. State |
|
|
|
|
|
|
|
that explicitly in the output to let the users know. |
|
|
|
|
|
|
|
(merge 2d4c993 jc/stash-pop-not-popped later to maint). |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* The labels in "git status" output that describe the nature of |
|
|
|
|
|
|
|
conflicts (e.g. "both deleted") were limited to 20 bytes, which was |
|
|
|
|
|
|
|
too short for some l10n (e.g. fr). |
|
|
|
|
|
|
|
(merge c7cb333 jn/wt-status later to maint). |
|
|
|
|
|
|
|
|
|
|
|
* "git clean -d pathspec" did not use the given pathspec correctly |
|
|
|
* "git clean -d pathspec" did not use the given pathspec correctly |
|
|
|
and ended up cleaning too much. |
|
|
|
and ended up cleaning too much. |
|
|
|
(merge 1f2e108 jk/clean-d-pathspec later to maint). |
|
|
|
(merge 1f2e108 jk/clean-d-pathspec later to maint). |
|
|
|