upleb.uk

Public git repos — served from a NIP-34 GRASP relay at git.upleb.uk

summaryrefslogtreecommitdiff
path: root/src/bin
diff options
context:
space:
mode:
Diffstat (limited to 'src/bin')
-rw-r--r--src/bin/ngit/sub_commands/list.rs8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/bin/ngit/sub_commands/list.rs b/src/bin/ngit/sub_commands/list.rs
index 1fe5b49..c3c8c71 100644
--- a/src/bin/ngit/sub_commands/list.rs
+++ b/src/bin/ngit/sub_commands/list.rs
@@ -244,16 +244,16 @@ pub async fn launch() -> Result<()> {
244 PromptChoiceParms::default() 244 PromptChoiceParms::default()
245 .with_default(0) 245 .with_default(0)
246 .with_choices(vec![ 246 .with_choices(vec![
247 "learn why 'patch only' proposals can't be checked out".to_string(), 247 "learn why this proposals can't be checked out".to_string(),
248 format!("apply to current branch with `git am`"), 248 format!("apply to current branch with `git am`"),
249 format!("download to ./patches"), 249 format!("download to ./patches"),
250 "back".to_string(), 250 "back".to_string(),
251 ]), 251 ]),
252 )? { 252 )? {
253 0 => { 253 0 => {
254 println!("Some proposals are posted as 'patch only'\n"); 254 println!("Some proposals are posted as patch without listing a parent commit\n");
255 println!( 255 println!(
256 "they are not anchored against a particular state of the code base like a standard proposal or a GitHub Pull Request can be\n" 256 "they are not anchored against a particular state of the code base like a standard patch or a pull request can be\n"
257 ); 257 );
258 println!( 258 println!(
259 "they are designed to reviewed by studying the diff (in a tool like gitworkshop.dev) and if acceptable by a maintainer, applied to the latest version of master with any conflicts resolved as the do so\n" 259 "they are designed to reviewed by studying the diff (in a tool like gitworkshop.dev) and if acceptable by a maintainer, applied to the latest version of master with any conflicts resolved as the do so\n"
@@ -262,7 +262,7 @@ pub async fn launch() -> Result<()> {
262 "this has proven to be a smoother workflow for large scale projects with a high frequency of changes, even when patches are exchanged via email\n" 262 "this has proven to be a smoother workflow for large scale projects with a high frequency of changes, even when patches are exchanged via email\n"
263 ); 263 );
264 println!( 264 println!(
265 "by default ngit posts proposals that support both the branch and patch model so either workflow can be used" 265 "by default ngit posts proposals with a parent commit so either workflow can be used"
266 ); 266 );
267 Interactor::default().choice( 267 Interactor::default().choice(
268 PromptChoiceParms::default() 268 PromptChoiceParms::default()