Merge branch 'tl/anno' into next
* tl/anno: annotate should number lines starting with 1 contrib/git-svn: fix a copied-tree bug in an overzealous assertion show-branch --topics: omit more uninteresting commits. workaround fat/ntfs deficiencies for t3600-rm.sh (git-rm) git-mv: fix moves into a subdir from outside send-email: accept --no-signed-off-by-cc as the documentation states contrib/git-svn: better documenting of CLI switches contrib/git-svn: add --id/-i=$GIT_SVN_ID command-line switch contrib/git-svn: avoid re-reading the repository uuid, it never changes contrib/git-svn: create a more recent master if one does not exist contrib/git-svn: cleanup option parsing contrib/git-svn: allow --authors-file to be specified contrib/git-svn: strip 'git-svn-id:' when commiting to SVN contrib/git-svn: several small bug fixes and changes contrib/git-svn: add -b/--branch switch for branch detection Prevent --index-info from ignoring -z. manpages: insert two missing [verse] markers for multi-line SYNOPSIS gitview: pass the missing argument _show_clicked_cb. Fix test case for some sed git-branch: add -r switch to list refs/remotes/*
No changes.