The second-order-diff Git trick
blog.moertel.com
The second-order-diff Git trick
1–10 of 44 posts
Re: The second-order-diff Git trick
#2git stash has other cool features and use cases (for example, when you want to pull from upstream and you have conflicting changes.) http://git-scm.com/book/ch6-3.html is a nice summary and the manpage also gives some sample workflows.
Re: The second-order-diff Git trick
#3Nice one, indeed!
Re: The second-order-diff Git trick
#4This is a great tip, thanks! I never thought of using git diff to test things out, and I definitely didn't know you could diff against a stash.
Re: The second-order-diff Git trick
#5I didn't know you could diff against a stash. http://www.hqew.net
Re: The second-order-diff Git trick
#6This is a great tip, thanks! I never thought of using git diff to test things out, and I definitely didn't know you could diff against a stash.
That was news to me as well. I've always done the following:
$ diff -u Re: The second-order-diff Git trick
#7This is very useful, as the article describes in detail.
I've found it useful to be able do diffs of diffs in my work, hence I'm planning to add the ability to do that to my toolset. Combined with live editing, I think it's going to be quite neat.
Re: The second-order-diff Git trick
#8git stash has other cool features and use cases (for example, when you want to pull from upstream and you have conflicting changes.) http://git-scm.com/book/ch6-3.html is a nice summary and the manpage also gives some sample workflows.
I actually saw this as a strike against git usability -- this should happen transparently imo, why should I have to git stash save; git pull --rebase; git stash pop for things to apply cleanly? Just do it automatically and fail if the stash application fails.
Re: The second-order-diff Git trick
#9Of course the problem here is that the GP can't actually be sure that every link he wanted to fix in the final step was fixed; just that the ones that _were_ fixed were fixed right!
Re: The second-order-diff Git trick
#10git stash has other cool features and use cases (for example, when you want to pull from upstream and you have conflicting changes.) http://git-scm.com/book/ch6-3.html is a nice summary and the manpage also gives some sample workflows.
I actually saw this as a strike against git usability -- this should happen transparently imo, why should I have to git stash save; git pull --rebase; git stash pop for things to apply cleanly? Just do it automatically and fail if the stash application fails.
Because then git would be doing magic stuff you don't (necessarily) understand, and people who like that aren't git's target audience. Those are all separate pieces of functionality that shouldn't be stuck together by default.