From 5c631e3654883fc753bb525cfe73861382d9a219 Mon Sep 17 00:00:00 2001 From: Ildar Absalyamov Date: Sat, 5 Dec 2015 00:25:45 -0800 Subject: [PATCH 1/4] Documented optional commit branch parameter in git-asf usage description --- git-asf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-asf b/git-asf index 3af9d06..10be91b 100755 --- a/git-asf +++ b/git-asf @@ -2,7 +2,7 @@ usage() { - echo "Usage: git asf commit " + echo "Usage: git asf commit [-b branch] " exit } From 8be18ff1de9e876ad146c55895e961bd554f313c Mon Sep 17 00:00:00 2001 From: Ildar Absalyamov Date: Tue, 8 Dec 2015 12:35:32 -0800 Subject: [PATCH 2/4] Added more docs on git gerrit update with merge update policy --- git-gerrit | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/git-gerrit b/git-gerrit index e97c20b..322cc1e 100755 --- a/git-gerrit +++ b/git-gerrit @@ -6,7 +6,7 @@ DATADIR=.git/gerrit-submit usage() { echo "Usage: git gerrit init [-u ] [-p ]" - echo " git gerrit update [-b ]" + echo " git gerrit update [-b ] [-m]" echo " git gerrit submit [-b ] [-d]" echo " git gerrit new" exit @@ -94,6 +94,7 @@ gerrit_update() ;; m) mergeop=merge + echo Using merge update policy ;; r) mergeop=rebase From 19fe799c36d4c89c1c2d6f1c9f7206aac384b38b Mon Sep 17 00:00:00 2001 From: Ildar Absalyamov Date: Tue, 8 Dec 2015 12:44:37 -0800 Subject: [PATCH 3/4] Small syntactic change --- git-asf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-asf b/git-asf index 10be91b..c5f9d99 100755 --- a/git-asf +++ b/git-asf @@ -2,7 +2,7 @@ usage() { - echo "Usage: git asf commit [-b branch] " + echo "Usage: git asf commit [-b < target branch>] " exit } From 529675d6829556dbb0c4db3fec9b542e0833ea86 Mon Sep 17 00:00:00 2001 From: Ildar Absalyamov Date: Tue, 8 Dec 2015 12:45:25 -0800 Subject: [PATCH 4/4] Yet another small syntactic change --- git-asf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-asf b/git-asf index c5f9d99..623d75d 100755 --- a/git-asf +++ b/git-asf @@ -2,7 +2,7 @@ usage() { - echo "Usage: git asf commit [-b < target branch>] " + echo "Usage: git asf commit [-b ] " exit }