Git fork

Git 1.7.10

Signed-off-by: Junio C Hamano <gitster@pobox.com>

+19 -11
+13 -10
Documentation/RelNotes/1.7.10.txt
··· 19 19 GIT_MERGE_AUTOEDIT=no 20 20 export GIT_MERGE_AUTOEDIT 21 21 22 - to disable this behaviour (if you want your users to explain their 22 + to disable this behavior (if you want your users to explain their 23 23 merge commits, you do not have to do anything). Alternatively, you 24 24 can give the "--no-edit" option to individual invocations of the 25 25 "git merge" command if you know everybody who uses your script has ··· 29 29 while and were deprecated in mid 2008 (v1.6.0). When you give these 30 30 options to "git am", it will now warn and ask you not to use them. 31 31 32 - * When you do not tell which branches and tags to push to the "git push" 33 - command in any way, the command used "matching refs" rule to update 34 - remote branches and tags with branches and tags with the same name you 35 - locally have. In future versions of Git, this will change to push out 36 - only your current branch according to either the "upstream" or the 37 - "current" rule. Although "upstream" may be more powerful once the 38 - user understands Git better, the semantics "current" gives is 39 - simpler and easier to understand for beginners and may be a safer 40 - and better default option, but we haven't decided yet. 32 + * When you do not tell which branches and tags to push to the "git 33 + push" command in any way, the command used "matching refs" rule to 34 + update remote branches and tags with branches and tags with the 35 + same name you locally have. In future versions of Git, this will 36 + change to push out only your current branch according to either the 37 + "upstream" or the "current" rule. Although "upstream" may be more 38 + powerful once the user understands Git better, the semantics 39 + "current" gives is simpler and easier to understand for beginners 40 + and may be a safer and better default option. We haven't decided 41 + yet which one to switch to. 41 42 42 43 43 44 Updates since v1.7.9 ··· 138 139 139 140 * Project search in "gitweb" shows the substring that matched in the 140 141 project name and description highlighted. 142 + 143 + * HTTP transport learned to authenticate with a proxy if needed. 141 144 142 145 * A new script "diffall" is added to contrib/; it drives an 143 146 external tool to perform a directory diff of two Git revisions
+5
Documentation/git.txt
··· 44 44 branch of the `git.git` repository. 45 45 Documentation for older releases are available here: 46 46 47 + * link:v1.7.10/git.html[documentation for release 1.7.10] 48 + 49 + * release notes for 50 + link:RelNotes/1.7.10.txt[1.7.10]. 51 + 47 52 * link:v1.7.9.6/git.html[documentation for release 1.7.9.6] 48 53 49 54 * release notes for
+1 -1
GIT-VERSION-GEN
··· 1 1 #!/bin/sh 2 2 3 3 GVF=GIT-VERSION-FILE 4 - DEF_VER=v1.7.10-rc4 4 + DEF_VER=v1.7.10 5 5 6 6 LF=' 7 7 '