Git discard changes1/30/2024 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 * based on ipt_FTOS.c (C) 2000 by Matthew G. +/* x_tables module for matching the IPv4/IPv6 DSCP field +++ -1,26 +1,31 x_tables module for setting the IPv4/IPv6 DSCP field + * 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 Using git stash apply - The command restores the changes but doesn't delete the stash from the ref. =/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 How to Drop a Git Stash There are two ways to restore work from the stash: Using git stash pop - The command restores the changes and schedules the stash for deletion. > # 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 > # modified: include/linux/netfilter_ipv4/ipt_ecn.h > # 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.
0 Comments
Leave a Reply.AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |