Alex Riesen wrote:My pull didn't fail, and your suggested list of commands tells me "Already up-to-date." I've pulled, reset, and removed perl/Makefile repeatedly when I was trying to use git-bisect. Primarily because of merge conflicts in perl/Makefile that running make causes. Johannes Schindeli wrote: Indeed, the following sequence works: git reset --hard touch perl/perl.mak make But this one doesn't: git reset --hard make touch perl/perl.mak make That one fails with "make[2]: *** No rule to make target `instlibdir'. Stop." And both of these sequences cause `git status` to report that "perl/ Makefile" has been changed, which doesn't seem ideal. (I'm replying to multiple messages because the list archive I'm browsing is getting the messages faster than I am, and I didn't feel the need to wait.) ~~ Brian - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
| Andreas Gruenbacher | Re: [AppArmor 39/45] AppArmor: Profile loading and manipulation, pathname matching |
| Alan Cox | Re: [patch 7/8] fdmap v2 - implement sys_socket2 |
| Jens Axboe | Re: regression: CD burning (k3b) went broke |
| Paul E. McKenney | Re: [PATCH 0/24] make atomic_read() behave consistently across all architectures |
git: | |
| KOSAKI Motohiro | [bug?] tg3: Failed to load firmware "tigon/tg3_tso.bin" |
| David Miller | [GIT]: Networking |
| Alexey Dobriyan | [PATCH 09/33] netns ct: per-netns /proc/net/nf_conntrack, /proc/net/stat/nf_conntr... |
| Gerrit Renker | [PATCH 18/37] dccp: Support for Mandatory options |
