Re: [git-users] how can i merge the specified commits, not the last N commits?

2023-11-17 Thread 凯夏
thank you, i will try this. On Friday, November 17, 2023 at 8:26:29 PM UTC+8 Konstantin Khomoutov wrote: > (Reformatted for the usual inline reply mode [1].) > > On Fri, Nov 17, 2023 at 02:09:11AM -0800, 凯夏 wrote: > > [...] > >>> how can i merge test1 test2 into feature1? > >>> e94e3c2 feature2 >

Re: [git-users] how can i merge the specified commits, not the last N commits?

2023-11-17 Thread Konstantin Khomoutov
(Reformatted for the usual inline reply mode [1].) On Fri, Nov 17, 2023 at 02:09:11AM -0800, 凯夏 wrote: [...] >>> how can i merge test1 test2 into feature1? >>> e94e3c2 feature2 >>> f509e6e test4 >>> 9972849 test3 >>> d7f2f97 feature1 >>> 04ea2a1 test2 >>> 1c0f590 test1 >>> a777378 init >> >> Bef

Re: [git-users] how can i merge the specified commits, not the last N commits?

2023-11-17 Thread 凯夏
* 36dd67b (76345bc) - center_after_2023-11-16T19:06:01 * 76345bc (3d730e1) - cron_2023-11-16T19:03:02+0800 * 3d730e1 (0fbd084) - center_after_2023-11-16T19:02:01 * 0fbd084 (3e8db69) - center_after_2023-11-16T19:00:01 * 3e8db69 (7efc990 a710c04) - center_before_2023-11-16T19:00:01 |\ | * a710

Re: [git-users] how can i merge the specified commits, not the last N commits?

2023-11-17 Thread 凯夏
git log --all --date-order --graph --pretty="%h %d (%p) - %s" * 4e702d9 (HEAD -> main) (394d1ad) - feature1 * 394d1ad (73da3a0) - test2 * 73da3a0 (cdda583) - test1 * cdda583 () - init On Friday, November 17, 2023 at 7:38:21 PM UTC+8 G. Sylvie Davies [bit-booster.com] wrote: > > Can you use

Re: [git-users] how can i merge the specified commits, not the last N commits?

2023-11-17 Thread G. Sylvie Davies [bit-booster.com]
Can you use this command for your "git log" ? git log --all --date-order --graph --pretty="%h %d (%p) - %s" That will help us understand better what you have done so far, and what you are trying to do. Sample output (from a different git repository): * 5625946 (HEAD -> master) (0a943a2 5b

Re: [git-users] how can i merge the specified commits, not the last N commits?

2023-11-17 Thread 凯夏
This is result of running git log. My bad, the result i want is git log output like this: yyy feature2 xxx feature1 a777378 init x and y means this can change. i just want to delete some unneeded commit to save space. because test1 maybe change 123 to 124 and test2 maybe change 124

Re: [git-users] how can i merge the specified commits, not the last N commits?

2023-11-17 Thread Konstantin Khomoutov
On Fri, Nov 17, 2023 at 01:00:46PM +0300, Konstantin Khomoutov wrote: >> how can i merge test1 test2 into feature1? >> e94e3c2 feature2 >> f509e6e test4 >> 9972849 test3 >> d7f2f97 feature1 >> 04ea2a1 test2 >> 1c0f590 test1 >> a777378 init > > Before we continue... Is this just a list of assorted

Re: [git-users] how can i merge the specified commits, not the last N commits?

2023-11-17 Thread Konstantin Khomoutov
On Fri, Nov 17, 2023 at 12:41:37AM -0800, 凯夏 wrote: > how can i merge test1 test2 into feature1? > e94e3c2 feature2 > f509e6e test4 > 9972849 test3 > d7f2f97 feature1 > 04ea2a1 test2 > 1c0f590 test1 > a777378 init Before we continue... Is this just a list of assorted commits with no inherent orde

[git-users] how can i merge the specified commits, not the last N commits?

2023-11-17 Thread 凯夏
how can i merge test1 test2 into feature1? e94e3c2 feature2 f509e6e test4 9972849 test3 d7f2f97 feature1 04ea2a1 test2 1c0f590 test1 a777378 init -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop rec