search

mcr / tcpdump

the TCPdump network dissector. now moved to:
https://github.com/the-tcpdump-group/tcpdump
Other
84 stars 2 forks source link

This addition to the credits file should be correct. #27

Closed dogbert2 closed 12 years ago

dogbert2 commented 12 years ago

The addition to the credits file should be correct now, since I used

:set fileformat=unix in GVim prior to write out the changes to the file.

infrastation commented 12 years ago

The new commit (1b9f7d9) is following the old one instead of replacing. Try dropping the wrong commit (4d3fc64) altogether instead of adding another (16c2065), which reverts it.

dogbert2 commented 12 years ago

Git manually via git bash will not allow me to drop the commit, it always aborts with an error. I'm actually giving up on this issue, since it would appear that the effort trying to get GitHub to work manually seems to actually be more trouble than it is worth, IMO.

Bill

On Sat, Sep 8, 2012 at 12:35 PM, Denis Ovsienko notifications@github.comwrote:

The new commit (1b9f7d9 https://github.com/mcr/tcpdump/commit/1b9f7d9) is following the old one instead of replacing. Try dropping the wrong commit (4d3fc64 https://github.com/mcr/tcpdump/commit/4d3fc64) altogether instead of adding another (16c2065https://github.com/mcr/tcpdump/commit/16c2065), which reverts it.

— Reply to this email directly or view it on GitHubhttps://github.com/mcr/tcpdump/pull/27#issuecomment-8397049.

infrastation commented 12 years ago

Windows is often getting in the way of good things. I've been using both GitHub (the web-site) and git (the command-line client) and both work fine on their own and together. "git rebase -i HEAD~5" allows dropping arbitrary commits and "git reset --hard HEAD~1" deletes only the last (after that "git push --force" is required to overwrite the remote branch).

dogbert2 commented 12 years ago

Well, I discovered that Git for Windows possesses a Git BASH shell, which drops a old hack like me into the familiar $ prompt, and it comes with it's own built in VIM at /bin/vim, which I'll use from now on to hack up code rather than trying to use windows explorer, since /bin/vim should be able to distinguish unix file types from 'whatever', additions should go in a lot easier since I can simply do this:

$ vim add/delete/change whatever in filename :wq $

at this point, Git in Windows should auto-resync and generate the proper diff with appropriate EOL stuff (unix only).

Bill

On Sun, Sep 9, 2012 at 11:28 AM, Denis Ovsienko notifications@github.comwrote:

Windows is often getting in the way of good things. I've been using both GitHub (the web-site) and git (the command-line client) and both work fine on their own and together. "git rebase -i HEAD~5" allows dropping arbitrary commits and "git reset --hard HEAD~1" deletes only the last (after that "git push --force" is required to overwrite the remote branch).

— Reply to this email directly or view it on GitHubhttps://github.com/mcr/tcpdump/pull/27#issuecomment-8407632.