psyc-mirrors/psyced
1
0
Fork 0
mirror of git://git.psyced.org/git/psyced synced 2024-08-15 03:25:10 +00:00
Code Issues 2 Releases Wiki Activity

reset in fetch could break some apps.. other minor reorg

Browse source
This commit is contained in:
psyc://psyced.org/~lynX 2010-02-23 16:15:44 +01:00
parent b48557c67a
commit f48a7380cd
7 changed files with 42 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

2
config/versioncontrol.tcsh
View file

@ -61,5 +61,5 @@ alias cvsdeath 'find . -name CVS -print -prune -exec rm -r {} \;'
# then "git fetch <nick>" and view with "gdifR <nick>"
alias gdifR 'git diff master..\!:1/master |& difvu -'
# to merge all the changes, use "gmergR <nick>"
alias gmergR 'git git merge -s resolve \!:1/master'
alias gmergR 'git merge -s resolve \!:1/master'