diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-12-31 15:00:38 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-12-31 15:00:38 -0800 |
| commit | 37bae10e38a66e4f1ddd5350daded00b21735126 (patch) | |
| tree | 1fbb3d5578e5bf0ed53503a6156535db96b83050 /Documentation | |
| parent | 4cc47382dfc2a71257934042f6c009287e101cb3 (diff) | |
| parent | 9bfff3ae5fdf1dcd0705056f7f9a42e81548797e (diff) | |
| download | git-37bae10e38a66e4f1ddd5350daded00b21735126.tar.gz git-37bae10e38a66e4f1ddd5350daded00b21735126.tar.xz | |
Merge branch 'maint'
* maint:
branch: die explicitly why when calling "git branch [-a|-r] branchname".
fast-import: Document author/committer/tagger name is optional
SubmittingPatches: hints to know the status of a submitted patch.
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/SubmittingPatches | 14 | ||||
| -rw-r--r-- | Documentation/git-fast-import.txt | 6 |
2 files changed, 17 insertions, 3 deletions
diff --git a/Documentation/SubmittingPatches b/Documentation/SubmittingPatches index 76fc84d87..c686f8646 100644 --- a/Documentation/SubmittingPatches +++ b/Documentation/SubmittingPatches @@ -280,6 +280,20 @@ people play with it without having to pick up and apply the patch to their trees themselves. ------------------------------------------------ +Know the status of your patch after submission + +* You can use Git itself to find out when your patch is merged in + master. 'git pull --rebase' will automatically skip already-applied + patches, and will let you know. This works only if you rebase on top + of the branch in which your patch has been merged (i.e. it will not + tell you if your patch is merged in pu if you rebase on top of + master). + +* Read the git mailing list, the maintainer regularly posts messages + entitled "What's cooking in git.git" and "What's in git.git" giving + the status of various proposed changes. + +------------------------------------------------ MUA specific hints Some of patches I receive or pick up from the list share common diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt index 288032c7b..e6d364f53 100644 --- a/Documentation/git-fast-import.txt +++ b/Documentation/git-fast-import.txt @@ -311,8 +311,8 @@ change to the project. .... 'commit' SP <ref> LF mark? - ('author' SP <name> SP LT <email> GT SP <when> LF)? - 'committer' SP <name> SP LT <email> GT SP <when> LF + ('author' (SP <name>)? SP LT <email> GT SP <when> LF)? + 'committer' (SP <name>)? SP LT <email> GT SP <when> LF data ('from' SP <committish> LF)? ('merge' SP <committish> LF)? @@ -657,7 +657,7 @@ lightweight (non-annotated) tags see the `reset` command below. .... 'tag' SP <name> LF 'from' SP <committish> LF - 'tagger' SP <name> SP LT <email> GT SP <when> LF + 'tagger' (SP <name>)? SP LT <email> GT SP <when> LF data .... |