File tree Expand file tree Collapse file tree 1 file changed +14
-14
lines changed
Expand file tree Collapse file tree 1 file changed +14
-14
lines changed Original file line number Diff line number Diff line change @@ -149,6 +149,15 @@ def main():
149149 action = "store_true" ,
150150 help = "print a diff instead of applying the changes" ,
151151 )
152+ p .add_argument (
153+ "--diff_from_common_commit" ,
154+ action = "store_true" ,
155+ help = (
156+ "diff from the last common commit for commits in "
157+ "separate branches rather than the exact point of the "
158+ "commits"
159+ ),
160+ )
152161 p .add_argument (
153162 "--diffstat" ,
154163 action = "store_true" ,
@@ -171,6 +180,11 @@ def main():
171180 p .add_argument (
172181 "-p" , "--patch" , action = "store_true" , help = "select hunks interactively"
173182 )
183+ p .add_argument (
184+ "--print0" ,
185+ action = "store_true" ,
186+ help = "end each printed filename with a null character" ,
187+ )
174188 p .add_argument (
175189 "-q" ,
176190 "--quiet" ,
@@ -196,20 +210,6 @@ def main():
196210 default = 0 ,
197211 help = "print extra information" ,
198212 )
199- p .add_argument (
200- "--diff_from_common_commit" ,
201- action = "store_true" ,
202- help = (
203- "diff from the last common commit for commits in "
204- "separate branches rather than the exact point of the "
205- "commits"
206- ),
207- )
208- p .add_argument (
209- "--print0" ,
210- action = "store_true" ,
211- help = "end each printed filename with a null character" ,
212- )
213213 # We gather all the remaining positional arguments into 'args' since we need
214214 # to use some heuristics to determine whether or not <commit> was present.
215215 # However, to print pretty messages, we make use of metavar and help.
You can’t perform that action at this time.
0 commit comments