Skip to content

Instantly share code, notes, and snippets.

@rfabbri
Created May 24, 2014 03:07
Show Gist options
  • Star 1 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save rfabbri/ffe3eb676517827fee07 to your computer and use it in GitHub Desktop.
Save rfabbri/ffe3eb676517827fee07 to your computer and use it in GitHub Desktop.
Git command journal to distill a best practice
502 git fetch
503 gitk --all
504 git branch
505 git checkout bnl
506 gitk
507 bg
508 d
509 cd brl/bbas/bnl
510 ls
511 g bnl_fresnel.h
512 d
513 cd ./algo/
514 ls
515 cd ..
516 ls
517 g bnl_fresnel.cxx
518 ls
519 ga minor cosmetic improvements
520 ls
521 cd ./tests/
522 d
523 ls
524 g CMakeLists.txt
525 ls
526 g test_driver.cxx
527 cd ..
528 ls
529 cd ./algo/
530 ls
531 cd tests/
532 ls
533 cd ..
534 ls
535 cd ..
536 ls
537 cd ./tests/
538 d
539 g test_fresnel.cxx
540 ls
541 ls
542 g test_include.cxx
543 ga more cosmetic changes to tests
544 ls
545 cd ..
546 ls
547 ls algo/
548 ls
549 git mv bnl_fresnel.cxx algo
550 git mv bnl_fresnel.h algo
551 ls
552 g algo/CMakeLists.txt
553 ls
554 ls tests/
555 git mv tests/test_fresnel.cxx algo/tests/
556 ls
557 cd algo/tests/
558 d
559 g CMakeLists.txt
560 d
561 cd ..
562 cd ..
563 d
564 ls tests/
565 ga moved bnl_fresnel to algo
566 ls
567 cd ./tests/
568 d
569 g CMakeLists.txt
570 ls
571 grep fresnel *
572 cd ../algo/
573 d
574 grep bnl_test tests/*
575 git branch
576 git checkout master
577 git checkout bnl
578 gitk --all
579 gitk
580 bg
581 git branch
582 git rebase master
583 gitk --all
584 gitk
585 git checkout master
586 git merge origin/master
587 git checkout bnl
588 git rebase master
589 git rebase master
590 git rebase --abort
591 git branch
592 gitk
593 git rebase --onto master caio-test bnl
594 gitk --all
595 bg
596 ls
597 git branch
598 git rebase -i master
599 gitk --all
600 git branch
601 git checkout master
602 git pull origin master
603 gitk --all
604 git branch
605 git merge origin/master
606 git checkout bnl
607 git rebase master
608 git branch
609 gitk
610 bg
611 d
612 git remote -v
613 git remote -v
614 git branch
615 git checkout master
616 git merge bnl
617 git push origin master
618 cd vxl
619 cdlvxl
620 ls
621 cd ./basic/
622 cd dbnl/
623 ls
624 ls algo/
625 ls
626 history
563 git checkout -b osx-compile-fixes remotes/gh/osx-compile-fixes
564 git branch
565 git checkout cosmetics
566 git rebase -i master
567 git rebase -i --onto master osx-compile-fixes cosmetics
568 git branch
569 git checkout master
570 git merge cosmetics
571 git push origin master
572 ls
573 cd ./algo/
574 d
575 g bvgl_eulerspiral.cxx
576 git branch
577 git push gh master
578 git remote -v
579 git branch -D cosmetics
580 ls
581 cd ..
582 ls
583 cd sel
584 history
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment