![]() ![]() Only part of diff file can be copied here. a/include/linux/netfilter/xt_rateest.hÄue to Stack Overflow length limit. ![]() +#define XT_DSCP_MASK 0xfc /* 11111100 */Äiff -git a/include/linux/netfilter/xt_mark.h b/include/linux/netfilter/xt_mark.hÄiff -git a/include/linux/netfilter/xt_rateest.h b/include/linux/netfilter/xt_rateest.h * See RFC2474 for a description of the DSCP field within the IP Header. * This software is distributed under GNU GPL v2, 1991 If you have already staged the changes with git add, you can see what patch you have staged with. You can also see the diff in a given sub-directory of your project: git diff path/to/a/dir/. * based on ipt_FTOS.c (C) 2000 by Matthew G. To see all the diff in tracked files but not staged: git diff. +/* x_tables module for matching the IPv4/IPv6 DSCP field Then, revert just that file: git checkout path/to/file.txt.Then find the commit you want to revert the file to. +++ -1,26 +1,31 x_tables module for setting the IPv4/IPv6 DSCP field If there are multiple commits with changes to the file, you could do: git log -p path/to/file.txt. + * the Free Software Foundation either version 2 of the License, orÄiff -git a/include/linux/netfilter/xt_DSCP.h b/include/linux/netfilter/xt_DSCP.h + * it under the terms of the GNU General Public License as published by + * This program is free software you can redistribute it and/or modify +/* Copyright (C) 2002,2004 MARA Systems AB a/include/linux/netfilter/xt_CONNMARK.h ![]() =/Applications/SourceTree.app/Contents/Resources/opendiff-w.sh "$LOCAL" "$REMOTE" -ancestor "$BASE" -merge "$MERGED"Ä®dited: this is my diff file: diff -git a/include/linux/netfilter/xt_CONNMARK.h b/include/linux/netfilter/xt_CONNMARK.h > # modified: include/linux/netfilter/xt_DSCP.hĬore.excludesfile=/Users/luke/.gitignore_globalÄ=opendiff "$LOCAL" "$REMOTE" > checkout - include/linux/netfilter/xt_dscp.h > # modified: include/linux/netfilter/xt_CONNMARK.h > checkout - include/linux/netfilter/xt_connmark. > # samples/hidraw/ no changes added to commit (use "git add" and/or "git commit -a") > # modified: net/ipv4/netfilter/ipt_ecn.c > # modified: include/linux/netfilter_ipv6/ip6t_hl.h ![]() > # modified: include/linux/netfilter_ipv4/ipt_ttl.h Notes: 1 WARNING you will lose ALL your local changes. > # modified: include/linux/netfilter_ipv4/ipt_ecn.h You can do it in a single command: git fetch -all & git reset -hard origin/master. > # modified: include/linux/netfilter/xt_tcpmss.h > # modified: include/linux/netfilter/xt_rateest.h > # modified: include/linux/netfilter/xt_mark.h > # modified: include/linux/netfilter/xt_dscp.h > # modified: include/linux/netfilter/xt_connmark.h " to discard changes in working directory) I git clone it to my local host.Īfter that. The obvious case is when you make some changes, commit them, then later decide you donât want them anymore.This is a Linux 2.6 kernel repository. But the state of your file will determine what changes youâre actually undoing. You may think of resetting a file as undoing changes. In this tutorial, we'll see how to discard changes in our working directory that are not in the index. A file can have different contents in each of these locations. Overview A Git working directory can contain different types of files including staged files, unstaged files, and untracked files. When youâre in the process of gathering changes, you stage files. Files that you commit ultimately end up in the repository. The files you edit locally belong to the working tree. The following terms are key to understanding the difference: working tree, staging area, and repository. On other occasions, you might want to roll back changes that you've already committed to the repository. Sometimes, youâll want to undo local changes so a file is back in sync with the current repository. d is to also remove untracked directories and f. On git, youd simply do: git reset -hard to discard changes made to versioned files git clean -xdf to erase new ( untracked) files, including ignored ones (the x option). Also, the git reset command might not match your expectations for what resetting means. On SourceTree for Windows, right click the files you want to discard (in the Working Copy Changes list), and choose Discard. Itâs important to note that resetting a file might mean different things to different people under different circumstances. ![]()
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |