Skip to content

Commit e8a4f31

Browse files
committed
compare branches in intellij
1 parent 374dbf1 commit e8a4f31

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

editor/intellij/shortcuts.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,15 @@ Move line or selection up/down.
6969

7070
- In code you can write TODOs and FIXME and then IDE can identify them and you can write code later on in there.
7171

72+
## Other receipes
73+
74+
#### Compare branches
75+
76+
- Press `Ctrl + Shift + A` to open the action window, search for `branches`, open branches window. Also can be done [as](https://www.jetbrains.com/help/pycharm/2016.1/accessing-git-branches-popup-menu.html).
77+
- Once branch pop-window is open, select with what branch you wanna compare current checked out branch.
78+
- It will open up a window with all changes, select a file you wanna compare.
79+
- Above steps are also given [here](https://www.jetbrains.com/help/pycharm/2016.1/merging-deleting-and-comparing-branches.html).
80+
7281

7382
## Ref:
7483

misc/linuxkernelhackathon2016Dec/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Date: Dec 3, 2016
44

55
## Requirements:
66

7-
- Linux kernel code: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
7+
- Linux kernel code: `git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git`
88
- Install `git-email` package
99
- Keep your gitconfig file to have send-mail
1010

0 commit comments

Comments
 (0)