Timeline for What is the benefit of git's two-stage commit process (staging)?
Current License: CC BY-SA 3.0
8 events
| when toggle format | what | by | license | comment | |
|---|---|---|---|---|---|
| Apr 10, 2018 at 17:29 | comment | added | alpha_989 | @ReinHenrichs, Even if the 2 stage model was a 1 stage model, could you just have committed the specific files into a single commit, in 1 shot? Also, why is the 2 stage model necessary to be able to do 'git add -p. I don't necessarily see a relationship between being able to add specific lines to git commit, and the 2 stage model. Could you point me to some references, or any tutorial on git add -p`? | |
| Feb 28, 2015 at 1:30 | comment | added | Aidiakapi | @Ian Your problem is really there, that you have a file which is supposed to be the configuration for the application also contain some machine/dev specific configuration. All configuration systems I know of allow you to split that into multiple files. So for example you have your app.conf which contains the stuff you want shared, and then a db.conf which you just put on the .gitignore list. Problem solved. If you're using something proprietary you should really look into getting something so simple in there. Or put it through a preprocessor in a pre-build event. Many solutions there. | |
| Apr 29, 2014 at 18:43 | comment | added | Ian | @ReinHenrichs, yes and it is very common when the file contains the name of the database server and each dev has there own database. | |
| Apr 29, 2014 at 16:58 | comment | added | Rein Henrichs | @Ian So part of the file changes infrequently and is shared and part of the file changes often, in incompatible ways, and isn't shared? Supporting this false connascence definitely sounds like an anti-feature. | |
| Apr 28, 2014 at 10:56 | comment | added | Ian | @ReinHenrichs, think about config files that need changing by each developer. | |
| Sep 29, 2013 at 22:43 | comment | added | Rein Henrichs | Ignoring local per-line changes and ensuring that your code differs from everyone else's in ways only you know about at the line level? That sounds like an anti-feature to me. | |
| Sep 29, 2013 at 15:48 | comment | added | alex gray | I've always wondered about how to do this. I wish there was a file .gitignorelines so you could make local changes to individual lines that could survive commits, and remain intact. | |
| Apr 18, 2011 at 16:14 | history | answered | Rein Henrichs | CC BY-SA 3.0 |