Includes test tapes for navigation, branch operations, stash operations, help panel, commits, and cursor navigation. Resolved stash conflicts by keeping simpler test versions. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
4223 lines
502 KiB
Plaintext
4223 lines
502 KiB
Plaintext
>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
> rm -rf /tmp/lazygit-keys-test && mkdir -p /tmp/lazygit-keys-test && cd /tmp/lazygit-keys-test
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
> rm -rf /tmp/lazygit-keys-test && mkdir -p /tmp/lazygit-keys-test && cd /tmp/lazygit-keys-test
|
|
>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
> rm -rf /tmp/lazygit-keys-test && mkdir -p /tmp/lazygit-keys-test && cd /tmp/lazygit-keys-test
|
|
>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
> rm -rf /tmp/lazygit-keys-test && mkdir -p /tmp/lazygit-keys-test && cd /tmp/lazygit-keys-test
|
|
> git init -b main && git config user.email 'test@test.com' && git config user.name 'Test'
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
> rm -rf /tmp/lazygit-keys-test && mkdir -p /tmp/lazygit-keys-test && cd /tmp/lazygit-keys-test
|
|
> git init -b main && git config user.email 'test@test.com' && git config user.name 'Test'
|
|
Initialized empty Git repository in /tmp/lazygit-keys-test/.git/
|
|
>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
> rm -rf /tmp/lazygit-keys-test && mkdir -p /tmp/lazygit-keys-test && cd /tmp/lazygit-keys-test
|
|
> git init -b main && git config user.email 'test@test.com' && git config user.name 'Test'
|
|
Initialized empty Git repository in /tmp/lazygit-keys-test/.git/
|
|
>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
> rm -rf /tmp/lazygit-keys-test && mkdir -p /tmp/lazygit-keys-test && cd /tmp/lazygit-keys-test
|
|
> git init -b main && git config user.email 'test@test.com' && git config user.name 'Test'
|
|
Initialized empty Git repository in /tmp/lazygit-keys-test/.git/
|
|
> echo 'initial' > file1.txt && echo 'initial' > file2.txt && git add . && git commit -m 'Initial commit'
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
> rm -rf /tmp/lazygit-keys-test && mkdir -p /tmp/lazygit-keys-test && cd /tmp/lazygit-keys-test
|
|
> git init -b main && git config user.email 'test@test.com' && git config user.name 'Test'
|
|
Initialized empty Git repository in /tmp/lazygit-keys-test/.git/
|
|
> echo 'initial' > file1.txt && echo 'initial' > file2.txt && git add . && git commit -m 'Initial commit'
|
|
[main (root-commit) 3dafa1c] Initial commit
|
|
2 files changed, 2 insertions(+)
|
|
create mode 100644 file1.txt
|
|
create mode 100644 file2.txt
|
|
>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
> rm -rf /tmp/lazygit-keys-test && mkdir -p /tmp/lazygit-keys-test && cd /tmp/lazygit-keys-test
|
|
> git init -b main && git config user.email 'test@test.com' && git config user.name 'Test'
|
|
Initialized empty Git repository in /tmp/lazygit-keys-test/.git/
|
|
> echo 'initial' > file1.txt && echo 'initial' > file2.txt && git add . && git commit -m 'Initial commit'
|
|
[main (root-commit) 3dafa1c] Initial commit
|
|
2 files changed, 2 insertions(+)
|
|
create mode 100644 file1.txt
|
|
create mode 100644 file2.txt
|
|
>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
> rm -rf /tmp/lazygit-keys-test && mkdir -p /tmp/lazygit-keys-test && cd /tmp/lazygit-keys-test
|
|
> git init -b main && git config user.email 'test@test.com' && git config user.name 'Test'
|
|
Initialized empty Git repository in /tmp/lazygit-keys-test/.git/
|
|
> echo 'initial' > file1.txt && echo 'initial' > file2.txt && git add . && git commit -m 'Initial commit'
|
|
[main (root-commit) 3dafa1c] Initial commit
|
|
2 files changed, 2 insertions(+)
|
|
create mode 100644 file1.txt
|
|
create mode 100644 file2.txt
|
|
> git checkout -b feature && echo 'feature' >> file1.txt && git add . && git commit -m 'Feature work' && git checkout main
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
> rm -rf /tmp/lazygit-keys-test && mkdir -p /tmp/lazygit-keys-test && cd /tmp/lazygit-keys-test
|
|
> git init -b main && git config user.email 'test@test.com' && git config user.name 'Test'
|
|
Initialized empty Git repository in /tmp/lazygit-keys-test/.git/
|
|
> echo 'initial' > file1.txt && echo 'initial' > file2.txt && git add . && git commit -m 'Initial commit'
|
|
[main (root-commit) 3dafa1c] Initial commit
|
|
2 files changed, 2 insertions(+)
|
|
create mode 100644 file1.txt
|
|
create mode 100644 file2.txt
|
|
> git checkout -b feature && echo 'feature' >> file1.txt && git add . && git commit -m 'Feature work' && git checkout main
|
|
Switched to a new branch 'feature'
|
|
[feature f50c712] Feature work
|
|
1 file changed, 1 insertion(+)
|
|
Switched to branch 'main'
|
|
>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
> rm -rf /tmp/lazygit-keys-test && mkdir -p /tmp/lazygit-keys-test && cd /tmp/lazygit-keys-test
|
|
> git init -b main && git config user.email 'test@test.com' && git config user.name 'Test'
|
|
Initialized empty Git repository in /tmp/lazygit-keys-test/.git/
|
|
> echo 'initial' > file1.txt && echo 'initial' > file2.txt && git add . && git commit -m 'Initial commit'
|
|
[main (root-commit) 3dafa1c] Initial commit
|
|
2 files changed, 2 insertions(+)
|
|
create mode 100644 file1.txt
|
|
create mode 100644 file2.txt
|
|
> git checkout -b feature && echo 'feature' >> file1.txt && git add . && git commit -m 'Feature work' && git checkout main
|
|
Switched to a new branch 'feature'
|
|
[feature f50c712] Feature work
|
|
1 file changed, 1 insertion(+)
|
|
Switched to branch 'main'
|
|
>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
> rm -rf /tmp/lazygit-keys-test && mkdir -p /tmp/lazygit-keys-test && cd /tmp/lazygit-keys-test
|
|
> git init -b main && git config user.email 'test@test.com' && git config user.name 'Test'
|
|
Initialized empty Git repository in /tmp/lazygit-keys-test/.git/
|
|
> echo 'initial' > file1.txt && echo 'initial' > file2.txt && git add . && git commit -m 'Initial commit'
|
|
[main (root-commit) 3dafa1c] Initial commit
|
|
2 files changed, 2 insertions(+)
|
|
create mode 100644 file1.txt
|
|
create mode 100644 file2.txt
|
|
> git checkout -b feature && echo 'feature' >> file1.txt && git add . && git commit -m 'Feature work' && git checkout main
|
|
Switched to a new branch 'feature'
|
|
[feature f50c712] Feature work
|
|
1 file changed, 1 insertion(+)
|
|
Switched to branch 'main'
|
|
> echo 'stash me' >> file1.txt && git stash push -m 'My stash entry'
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
> rm -rf /tmp/lazygit-keys-test && mkdir -p /tmp/lazygit-keys-test && cd /tmp/lazygit-keys-test
|
|
> git init -b main && git config user.email 'test@test.com' && git config user.name 'Test'
|
|
Initialized empty Git repository in /tmp/lazygit-keys-test/.git/
|
|
> echo 'initial' > file1.txt && echo 'initial' > file2.txt && git add . && git commit -m 'Initial commit'
|
|
[main (root-commit) 3dafa1c] Initial commit
|
|
2 files changed, 2 insertions(+)
|
|
create mode 100644 file1.txt
|
|
create mode 100644 file2.txt
|
|
> git checkout -b feature && echo 'feature' >> file1.txt && git add . && git commit -m 'Feature work' && git checkout main
|
|
Switched to a new branch 'feature'
|
|
[feature f50c712] Feature work
|
|
1 file changed, 1 insertion(+)
|
|
Switched to branch 'main'
|
|
> echo 'stash me' >> file1.txt && git stash push -m 'My stash entry'
|
|
Saved working directory and index state On main: My stash entry
|
|
>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
> rm -rf /tmp/lazygit-keys-test && mkdir -p /tmp/lazygit-keys-test && cd /tmp/lazygit-keys-test
|
|
> git init -b main && git config user.email 'test@test.com' && git config user.name 'Test'
|
|
Initialized empty Git repository in /tmp/lazygit-keys-test/.git/
|
|
> echo 'initial' > file1.txt && echo 'initial' > file2.txt && git add . && git commit -m 'Initial commit'
|
|
[main (root-commit) 3dafa1c] Initial commit
|
|
2 files changed, 2 insertions(+)
|
|
create mode 100644 file1.txt
|
|
create mode 100644 file2.txt
|
|
> git checkout -b feature && echo 'feature' >> file1.txt && git add . && git commit -m 'Feature work' && git checkout main
|
|
Switched to a new branch 'feature'
|
|
[feature f50c712] Feature work
|
|
1 file changed, 1 insertion(+)
|
|
Switched to branch 'main'
|
|
> echo 'stash me' >> file1.txt && git stash push -m 'My stash entry'
|
|
Saved working directory and index state On main: My stash entry
|
|
>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
> rm -rf /tmp/lazygit-keys-test && mkdir -p /tmp/lazygit-keys-test && cd /tmp/lazygit-keys-test
|
|
> git init -b main && git config user.email 'test@test.com' && git config user.name 'Test'
|
|
Initialized empty Git repository in /tmp/lazygit-keys-test/.git/
|
|
> echo 'initial' > file1.txt && echo 'initial' > file2.txt && git add . && git commit -m 'Initial commit'
|
|
[main (root-commit) 3dafa1c] Initial commit
|
|
2 files changed, 2 insertions(+)
|
|
create mode 100644 file1.txt
|
|
create mode 100644 file2.txt
|
|
> git checkout -b feature && echo 'feature' >> file1.txt && git add . && git commit -m 'Feature work' && git checkout main
|
|
Switched to a new branch 'feature'
|
|
[feature f50c712] Feature work
|
|
1 file changed, 1 insertion(+)
|
|
Switched to branch 'main'
|
|
> echo 'stash me' >> file1.txt && git stash push -m 'My stash entry'
|
|
Saved working directory and index state On main: My stash entry
|
|
> echo 'unstaged change' >> file1.txt && echo 'staged change' >> file2.txt && git add file2.txt
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
> rm -rf /tmp/lazygit-keys-test && mkdir -p /tmp/lazygit-keys-test && cd /tmp/lazygit-keys-test
|
|
> git init -b main && git config user.email 'test@test.com' && git config user.name 'Test'
|
|
Initialized empty Git repository in /tmp/lazygit-keys-test/.git/
|
|
> echo 'initial' > file1.txt && echo 'initial' > file2.txt && git add . && git commit -m 'Initial commit'
|
|
[main (root-commit) 3dafa1c] Initial commit
|
|
2 files changed, 2 insertions(+)
|
|
create mode 100644 file1.txt
|
|
create mode 100644 file2.txt
|
|
> git checkout -b feature && echo 'feature' >> file1.txt && git add . && git commit -m 'Feature work' && git checkout main
|
|
Switched to a new branch 'feature'
|
|
[feature f50c712] Feature work
|
|
1 file changed, 1 insertion(+)
|
|
Switched to branch 'main'
|
|
> echo 'stash me' >> file1.txt && git stash push -m 'My stash entry'
|
|
Saved working directory and index state On main: My stash entry
|
|
> echo 'unstaged change' >> file1.txt && echo 'staged change' >> file2.txt && git add file2.txt
|
|
>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
> rm -rf /tmp/lazygit-keys-test && mkdir -p /tmp/lazygit-keys-test && cd /tmp/lazygit-keys-test
|
|
> git init -b main && git config user.email 'test@test.com' && git config user.name 'Test'
|
|
Initialized empty Git repository in /tmp/lazygit-keys-test/.git/
|
|
> echo 'initial' > file1.txt && echo 'initial' > file2.txt && git add . && git commit -m 'Initial commit'
|
|
[main (root-commit) 3dafa1c] Initial commit
|
|
2 files changed, 2 insertions(+)
|
|
create mode 100644 file1.txt
|
|
create mode 100644 file2.txt
|
|
> git checkout -b feature && echo 'feature' >> file1.txt && git add . && git commit -m 'Feature work' && git checkout main
|
|
Switched to a new branch 'feature'
|
|
[feature f50c712] Feature work
|
|
1 file changed, 1 insertion(+)
|
|
Switched to branch 'main'
|
|
> echo 'stash me' >> file1.txt && git stash push -m 'My stash entry'
|
|
Saved working directory and index state On main: My stash entry
|
|
> echo 'unstaged change' >> file1.txt && echo 'staged change' >> file2.txt && git add file2.txt
|
|
>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
> rm -rf /tmp/lazygit-keys-test && mkdir -p /tmp/lazygit-keys-test && cd /tmp/lazygit-keys-test
|
|
> git init -b main && git config user.email 'test@test.com' && git config user.name 'Test'
|
|
Initialized empty Git repository in /tmp/lazygit-keys-test/.git/
|
|
> echo 'initial' > file1.txt && echo 'initial' > file2.txt && git add . && git commit -m 'Initial commit'
|
|
[main (root-commit) 3dafa1c] Initial commit
|
|
2 files changed, 2 insertions(+)
|
|
create mode 100644 file1.txt
|
|
create mode 100644 file2.txt
|
|
> git checkout -b feature && echo 'feature' >> file1.txt && git add . && git commit -m 'Feature work' && git checkout main
|
|
Switched to a new branch 'feature'
|
|
[feature f50c712] Feature work
|
|
1 file changed, 1 insertion(+)
|
|
Switched to branch 'main'
|
|
> echo 'stash me' >> file1.txt && git stash push -m 'My stash entry'
|
|
Saved working directory and index state On main: My stash entry
|
|
> echo 'unstaged change' >> file1.txt && echo 'staged change' >> file2.txt && git add file2.txt
|
|
> lazygit
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
╭─[1]─Status───────────────────────────────╮╭─[0]─Unstaged changes────────────────────────────────────────────────────────────────╮
|
|
│lazygit-keys-test → main ││diff --git a/file1.txt b/file1.txt ▐
|
|
╰──────────────────────────────────────────╯│index e79c5e8..40e29ef 100644 ▐
|
|
╭─[2]─Files - Worktrees - Submodules───────╮│--- a/file1.txt ▐
|
|
│▼ / ││+++ b/file1.txt ▐
|
|
│ M file1.txt ││@@ -1 +1,2 @@ ▐
|
|
│ M file2.txt ││ initial ▐
|
|
│ ││+unstaged change ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
╰───────────────────────────────────1 of 3─╯│ │
|
|
╭─[3]─Local branches - Remotes - Tags──────╮╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
│ * main │╭─Staged changes──────────────────────────────────────────────────────────────────────╮
|
|
│10s feature ││diff --git a/file2.txt b/file2.txt ▐
|
|
│ ││index e79c5e8..e5f18d7 100644 ▐
|
|
│ ││--- a/file2.txt ▐
|
|
│ ││+++ b/file2.txt ▐
|
|
│ ││@@ -1 +1,2 @@ ▐
|
|
│ ││ initial ▐
|
|
│ ││+staged change ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
╰───────────────────────────────────1 of 2─╯│ ▐
|
|
╭─[4]─Commits - Reflog─────────────────────╮│ ▐
|
|
│3dafa1cf Te ◯ Initial commit ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ │╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
│ │╭─Command log─────────────────────────────────────────────────────────────────────────╮
|
|
│ ││You can hide/focus this panel by pressing '@' │
|
|
│ ││ │
|
|
│ ││Random tip: You can page through the items of a panel using ',' and '.' │
|
|
│ ││ │
|
|
│ ││ │
|
|
╰───────────────────────────────────1 of 1─╯│ │
|
|
╭─[5]─Stash────────────────────────────────╮│ │
|
|
│6s On main: My stash entry ││ │
|
|
╰───────────────────────────────────1 of 1─╯╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
Stage: <space> | Commit: c | Stash: s | Discard: d | Reset: D | Keybindings: ? Donate Ask Question 0.58.1
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
╭─[1]─Status───────────────────────────────╮╭─[0]─Unstaged changes────────────────────────────────────────────────────────────────╮
|
|
│lazygit-keys-test → main ││diff --git a/file1.txt b/file1.txt ▐
|
|
╰──────────────────────────────────────────╯│index e79c5e8..40e29ef 100644 ▐
|
|
╭─[2]─Files - Worktrees - Submodules───────╮│--- a/file1.txt ▐
|
|
│▼ / ││+++ b/file1.txt ▐
|
|
│ M file1.txt ││@@ -1 +1,2 @@ ▐
|
|
│ M file2.txt ││ initial ▐
|
|
│ ││+unstaged change ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
╰───────────────────────────────────1 of 3─╯│ │
|
|
╭─[3]─Local branches - Remotes - Tags──────╮╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
│ * main │╭─Staged changes──────────────────────────────────────────────────────────────────────╮
|
|
│10s feature ││diff --git a/file2.txt b/file2.txt ▐
|
|
│ ││index e79c5e8..e5f18d7 100644 ▐
|
|
│ ││--- a/file2.txt ▐
|
|
│ ││+++ b/file2.txt ▐
|
|
│ ││@@ -1 +1,2 @@ ▐
|
|
│ ││ initial ▐
|
|
│ ││+staged change ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
╰───────────────────────────────────1 of 2─╯│ ▐
|
|
╭─[4]─Commits - Reflog─────────────────────╮│ ▐
|
|
│3dafa1cf Te ◯ Initial commit ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ │╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
│ │╭─Command log─────────────────────────────────────────────────────────────────────────╮
|
|
│ ││You can hide/focus this panel by pressing '@' │
|
|
│ ││ │
|
|
│ ││Random tip: You can page through the items of a panel using ',' and '.' │
|
|
│ ││ │
|
|
│ ││ │
|
|
╰───────────────────────────────────1 of 1─╯│ │
|
|
╭─[5]─Stash────────────────────────────────╮│ │
|
|
│6s On main: My stash entry ││ │
|
|
╰───────────────────────────────────1 of 1─╯╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
Stage: <space> | Commit: c | Stash: s | Discard: d | Reset: D | Keybindings: ? Donate Ask Question 0.58.1
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
╭─[1]─Status───────────────────────────────╮╭─[0]─Unstaged changes────────────────────────────────────────────────────────────────╮
|
|
│lazygit-keys-test → main ││diff --git a/file1.txt b/file1.txt ▐
|
|
╰──────────────────────────────────────────╯│index e79c5e8..40e29ef 100644 ▐
|
|
╭─[2]─Files - Worktrees - Submodules───────╮│--- a/file1.txt ▐
|
|
│▼ / ││+++ b/file1.txt ▐
|
|
│ M file1.txt ││@@ -1 +1,2 @@ ▐
|
|
│ M file2.txt ││ initial ▐
|
|
│ ││+unstaged change ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
╰───────────────────────────────────1 of 3─╯│ │
|
|
╭─[3]─Local branches - Remotes - Tags──────╮╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
│ * main │╭─Staged changes──────────────────────────────────────────────────────────────────────╮
|
|
│10s feature ││diff --git a/file2.txt b/file2.txt ▐
|
|
│ ││index e79c5e8..e5f18d7 100644 ▐
|
|
│ ││--- a/file2.txt ▐
|
|
│ ││+++ b/file2.txt ▐
|
|
│ ││@@ -1 +1,2 @@ ▐
|
|
│ ││ initial ▐
|
|
│ ││+staged change ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
╰───────────────────────────────────1 of 2─╯│ ▐
|
|
╭─[4]─Commits - Reflog─────────────────────╮│ ▐
|
|
│3dafa1cf Te ◯ Initial commit ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ │╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
│ │╭─Command log─────────────────────────────────────────────────────────────────────────╮
|
|
│ ││You can hide/focus this panel by pressing '@' │
|
|
│ ││ │
|
|
│ ││Random tip: You can page through the items of a panel using ',' and '.' │
|
|
│ ││ │
|
|
│ ││ │
|
|
╰───────────────────────────────────1 of 1─╯│ │
|
|
╭─[5]─Stash────────────────────────────────╮│ │
|
|
│6s On main: My stash entry ││ │
|
|
╰───────────────────────────────────1 of 1─╯╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
Stage: <space> | Commit: c | Stash: s | Discard: d | Reset: D | Keybindings: ? Donate Ask Question 0.58.1
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
╭─[1]─Status───────────────────────────────╮╭─[0]─Unstaged changes────────────────────────────────────────────────────────────────╮
|
|
│lazygit-keys-test → main ││diff --git a/file1.txt b/file1.txt ▐
|
|
╰──────────────────────────────────────────╯│index e79c5e8..40e29ef 100644 ▐
|
|
╭─[2]─Files - Worktrees - Submodules───────╮│--- a/file1.txt ▐
|
|
│▼ / ││+++ b/file1.txt ▐
|
|
│ M file1.txt ││@@ -1 +1,2 @@ ▐
|
|
│ M file2.txt ││ initial ▐
|
|
│ ││+unstaged change ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
╰───────────────────────────────────1 of 3─╯│ │
|
|
╭─[3]─Local branches - Remotes - Tags──────╮╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
│ * main │╭─Staged changes──────────────────────────────────────────────────────────────────────╮
|
|
│10s feature ││diff --git a/file2.txt b/file2.txt ▐
|
|
│ ││index e79c5e8..e5f18d7 100644 ▐
|
|
│ ││--- a/file2.txt ▐
|
|
│ ││+++ b/file2.txt ▐
|
|
│ ││@@ -1 +1,2 @@ ▐
|
|
│ ││ initial ▐
|
|
│ ││+staged change ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
╰───────────────────────────────────1 of 2─╯│ ▐
|
|
╭─[4]─Commits - Reflog─────────────────────╮│ ▐
|
|
│3dafa1cf Te ◯ Initial commit ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ │╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
│ │╭─Command log─────────────────────────────────────────────────────────────────────────╮
|
|
│ ││You can hide/focus this panel by pressing '@' │
|
|
│ ││ │
|
|
│ ││Random tip: You can page through the items of a panel using ',' and '.' │
|
|
│ ││ │
|
|
│ ││ │
|
|
╰───────────────────────────────────1 of 1─╯│ │
|
|
╭─[5]─Stash────────────────────────────────╮│ │
|
|
│6s On main: My stash entry ││ │
|
|
╰───────────────────────────────────1 of 1─╯╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
Stage: <space> | Commit: c | Stash: s | Discard: d | Reset: D | Keybindings: ? Donate Ask Question 0.58.1
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
╭─[1]─Status───────────────────────────────╮╭─[0]─Unstaged changes────────────────────────────────────────────────────────────────╮
|
|
│lazygit-keys-test → main ││diff --git a/file1.txt b/file1.txt ▐
|
|
╰──────────────────────────────────────────╯│index e79c5e8..40e29ef 100644 ▐
|
|
╭─[2]─Files - Worktrees - Submodules───────╮│--- a/file1.txt ▐
|
|
│▼ / ││+++ b/file1.txt ▐
|
|
│ M file1.txt ││@@ -1 +1,2 @@ ▐
|
|
│ M file2.txt ││ initial ▐
|
|
│ ││+unstaged change ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
╰───────────────────────────────────1 of 3─╯│ │
|
|
╭─[3]─Local branches - Remotes - Tags──────╮╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
│ * main │╭─Staged changes──────────────────────────────────────────────────────────────────────╮
|
|
│10s feature ││diff --git a/file2.txt b/file2.txt ▐
|
|
│ ││index e79c5e8..e5f18d7 100644 ▐
|
|
│ ││--- a/file2.txt ▐
|
|
│ ││+++ b/file2.txt ▐
|
|
│ ││@@ -1 +1,2 @@ ▐
|
|
│ ││ initial ▐
|
|
│ ││+staged change ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
╰───────────────────────────────────1 of 2─╯│ ▐
|
|
╭─[4]─Commits - Reflog─────────────────────╮│ ▐
|
|
│3dafa1cf Te ◯ Initial commit ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ │╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
│ │╭─Command log─────────────────────────────────────────────────────────────────────────╮
|
|
│ ││You can hide/focus this panel by pressing '@' │
|
|
│ ││ │
|
|
│ ││Random tip: You can page through the items of a panel using ',' and '.' │
|
|
│ ││ │
|
|
│ ││ │
|
|
╰───────────────────────────────────1 of 1─╯│ │
|
|
╭─[5]─Stash────────────────────────────────╮│ │
|
|
│6s On main: My stash entry ││ │
|
|
╰───────────────────────────────────1 of 1─╯╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
Stage: <space> | Commit: c | Stash: s | Discard: d | Reset: D | Keybindings: ? Donate Ask Question 0.58.1
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
╭─[1]─Status───────────────────────────────╮╭─[0]─Unstaged changes────────────────────────────────────────────────────────────────╮
|
|
│lazygit-keys-test → main ││diff --git a/file1.txt b/file1.txt ▐
|
|
╰──────────────────────────────────────────╯│index e79c5e8..40e29ef 100644 ▐
|
|
╭─[2]─Files - Worktrees - Submodules───────╮│--- a/file1.txt ▐
|
|
│▼ / ││+++ b/file1.txt ▐
|
|
│ M file1.txt ││@@ -1 +1,2 @@ ▐
|
|
│ M file2.txt ││ initial ▐
|
|
│ ││+unstaged change ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
╰───────────────────────────────────2 of 3─╯│ ▐
|
|
╭─[3]─Local branches - Remotes - Tags──────╮│ ▐
|
|
│ * main ││ ▐
|
|
│10s feature ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
╰───────────────────────────────────1 of 2─╯│ ▐
|
|
╭─[4]─Commits - Reflog─────────────────────╮│ │
|
|
│3dafa1cf Te ◯ Initial commit ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ │╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
│ │╭─Command log─────────────────────────────────────────────────────────────────────────╮
|
|
│ ││You can hide/focus this panel by pressing '@' │
|
|
│ ││ │
|
|
│ ││Random tip: You can page through the items of a panel using ',' and '.' │
|
|
│ ││ │
|
|
│ ││ │
|
|
╰───────────────────────────────────1 of 1─╯│ │
|
|
╭─[5]─Stash────────────────────────────────╮│ │
|
|
│6s On main: My stash entry ││ │
|
|
╰───────────────────────────────────1 of 1─╯╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
Stage: <space> | Commit: c | Edit: e | Stash: s | Discard: d | Reset: D | Keybindings: ? Donate Ask Question 0.58.1
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
╭─[1]─Status───────────────────────────────╮╭─[0]─Unstaged changes────────────────────────────────────────────────────────────────╮
|
|
│lazygit-keys-test → main ││diff --git a/file1.txt b/file1.txt ▐
|
|
╰──────────────────────────────────────────╯│index e79c5e8..40e29ef 100644 ▐
|
|
╭─[2]─Files - Worktrees - Submodules───────╮│--- a/file1.txt ▐
|
|
│▼ / ││+++ b/file1.txt ▐
|
|
│ M file1.txt ││@@ -1 +1,2 @@ ▐
|
|
│ M file2.txt ││ initial ▐
|
|
│ ││+unstaged change ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
╰───────────────────────────────────2 of 3─╯│ ▐
|
|
╭─[3]─Local branches - Remotes - Tags──────╮│ ▐
|
|
│ * main ││ ▐
|
|
│10s feature ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
╰───────────────────────────────────1 of 2─╯│ ▐
|
|
╭─[4]─Commits - Reflog─────────────────────╮│ │
|
|
│3dafa1cf Te ◯ Initial commit ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ │╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
│ │╭─Command log─────────────────────────────────────────────────────────────────────────╮
|
|
│ ││You can hide/focus this panel by pressing '@' │
|
|
│ ││ │
|
|
│ ││Random tip: You can page through the items of a panel using ',' and '.' │
|
|
│ ││ │
|
|
│ ││ │
|
|
╰───────────────────────────────────1 of 1─╯│ │
|
|
╭─[5]─Stash────────────────────────────────╮│ │
|
|
│6s On main: My stash entry ││ │
|
|
╰───────────────────────────────────1 of 1─╯╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
Stage: <space> | Commit: c | Edit: e | Stash: s | Discard: d | Reset: D | Keybindings: ? Donate Ask Question 0.58.1
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
╭─[1]─Status───────────────────────────────╮╭─[0]─Staged changes──────────────────────────────────────────────────────────────────╮
|
|
│lazygit-keys-test → main ││diff --git a/file1.txt b/file1.txt ▐
|
|
╰──────────────────────────────────────────╯│index e79c5e8..40e29ef 100644 ▐
|
|
╭─[2]─Files - Worktrees - Submodules───────╮│--- a/file1.txt ▐
|
|
│▼ / ││+++ b/file1.txt ▐
|
|
│ M file1.txt ││@@ -1 +1,2 @@ ▐
|
|
│ M file2.txt ││ initial ▐
|
|
│ ││+unstaged change ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
╰───────────────────────────────────2 of 3─╯│ ▐
|
|
╭─[3]─Local branches - Remotes - Tags──────╮│ ▐
|
|
│ * main ││ ▐
|
|
│10s feature ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
╰───────────────────────────────────1 of 2─╯│ ▐
|
|
╭─[4]─Commits - Reflog─────────────────────╮│ │
|
|
│3dafa1cf Te ◯ Initial commit ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ │╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
│ │╭─Command log─────────────────────────────────────────────────────────────────────────╮
|
|
│ ││You can hide/focus this panel by pressing '@' │
|
|
│ ││ │
|
|
│ ││Random tip: You can page through the items of a panel using ',' and '.' │
|
|
│ ││Stage file │
|
|
│ ││ git add -- file1.txt │
|
|
╰───────────────────────────────────1 of 1─╯│ │
|
|
╭─[5]─Stash────────────────────────────────╮│ │
|
|
│6s On main: My stash entry ││ │
|
|
╰───────────────────────────────────1 of 1─╯╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
Stage: <space> | Commit: c | Edit: e | Stash: s | Discard: d | Reset: D | Keybindings: ? Donate Ask Question 0.58.1
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
╭─[1]─Status───────────────────────────────╮╭─[0]─Staged changes──────────────────────────────────────────────────────────────────╮
|
|
│lazygit-keys-test → main ││diff --git a/file1.txt b/file1.txt ▐
|
|
╰──────────────────────────────────────────╯│index e79c5e8..40e29ef 100644 ▐
|
|
╭─[2]─Files - Worktrees - Submodules───────╮│--- a/file1.txt ▐
|
|
│▼ / ││+++ b/file1.txt ▐
|
|
│ M file1.txt ││@@ -1 +1,2 @@ ▐
|
|
│ M file2.txt ││ initial ▐
|
|
│ ││+unstaged change ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
╰───────────────────────────────────2 of 3─╯│ ▐
|
|
╭─[3]─Local branches - Remotes - Tags──────╮│ ▐
|
|
│ * main ││ ▐
|
|
│10s feature ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
╰───────────────────────────────────1 of 2─╯│ ▐
|
|
╭─[4]─Commits - Reflog─────────────────────╮│ │
|
|
│3dafa1cf Te ◯ Initial commit ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ │╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
│ │╭─Command log─────────────────────────────────────────────────────────────────────────╮
|
|
│ ││You can hide/focus this panel by pressing '@' │
|
|
│ ││ │
|
|
│ ││Random tip: You can page through the items of a panel using ',' and '.' │
|
|
│ ││Stage file │
|
|
│ ││ git add -- file1.txt │
|
|
╰───────────────────────────────────1 of 1─╯│ │
|
|
╭─[5]─Stash────────────────────────────────╮│ │
|
|
│6s On main: My stash entry ││ │
|
|
╰───────────────────────────────────1 of 1─╯╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
Stage: <space> | Commit: c | Edit: e | Stash: s | Discard: d | Reset: D | Keybindings: ? Donate Ask Question 0.58.1
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
╭─[1]─Status───────────────────────────────╮╭─[0]─Staged changes──────────────────────────────────────────────────────────────────╮
|
|
│lazygit-keys-test → main ││diff --git a/file1.txt b/file1.txt ▐
|
|
╰──────────────────────────────────────────╯│index e79c5e8..40e29ef 100644 ▐
|
|
╭─[2]─Files - Worktrees - Submodules───────╮│--- a/file1.txt ▐
|
|
│▼ / ││+++ b/file1.txt ▐
|
|
│ M file1.txt ││@@ -1 +1,2 @@ ▐
|
|
│ M file2.txt ││ initial ▐
|
|
│ ││+unstaged change ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
╰───────────────────────────────────2 of 3─╯│ ▐
|
|
╭─[3]─Local branches - Remotes - Tags──────╮│ ▐
|
|
│ * main ││ ▐
|
|
│10s feature ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
╰───────────────────────────────────1 of 2─╯│ ▐
|
|
╭─[4]─Commits - Reflog─────────────────────╮│ │
|
|
│3dafa1cf Te ◯ Initial commit ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ │╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
│ │╭─Command log─────────────────────────────────────────────────────────────────────────╮
|
|
│ ││You can hide/focus this panel by pressing '@' │
|
|
│ ││ │
|
|
│ ││Random tip: You can page through the items of a panel using ',' and '.' │
|
|
│ ││Stage file │
|
|
│ ││ git add -- file1.txt │
|
|
╰───────────────────────────────────1 of 1─╯│ │
|
|
╭─[5]─Stash────────────────────────────────╮│ │
|
|
│6s On main: My stash entry ││ │
|
|
╰───────────────────────────────────1 of 1─╯╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
Stage: <space> | Commit: c | Edit: e | Stash: s | Discard: d | Reset: D | Keybindings: ? Donate Ask Question 0.58.1
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
╭─[1]─Status───────────────────────────────╮╭─Unstaged changes────────────────────────────────────────────────────────────────────╮
|
|
│lazygit-keys-test → main ││ │
|
|
╰──────────────────────────────────────────╯│ │
|
|
╭─[2]─Files - Worktrees - Submodules───────╮│ │
|
|
│▼ / ││ │
|
|
│ M file1.txt ││ │
|
|
│ M file2.txt ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
╰───────────────────────────────────2 of 3─╯│ │
|
|
╭─[3]─Local branches - Re╭───────────────────────────────────────────────────────────────────────────────╮────────────────────────╯
|
|
│ * main │Hunk selection mode is now the default for staging. If you want to stage │────────────────────────╮
|
|
│10s feature │individual lines, press 'a' to switch to line-by-line mode. │ ▐
|
|
│ │ │ ▐
|
|
│ │If you prefer to use line-by-line mode by default (like in earlier lazygit │ ▐
|
|
│ │versions), add │ ▐
|
|
│ │ │ ▐
|
|
│ │gui: │ ▐
|
|
│ │ useHunkModeInStagingView: false │ ▐
|
|
│ │ │ ▐
|
|
│ │to your lazygit config. │ ▐
|
|
│ ╰───────────────────────────────────────────────────────────────────────────────╯ ▐
|
|
╰───────────────────────────────────1 of 2─╯│ ▐
|
|
╭─[4]─Commits - Reflog─────────────────────╮│ ▐
|
|
│3dafa1cf Te ◯ Initial commit ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ │╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
│ │╭─Command log─────────────────────────────────────────────────────────────────────────╮
|
|
│ ││You can hide/focus this panel by pressing '@' │
|
|
│ ││ │
|
|
│ ││Random tip: You can page through the items of a panel using ',' and '.' │
|
|
│ ││Stage file │
|
|
│ ││ git add -- file1.txt │
|
|
╰───────────────────────────────────1 of 1─╯│ │
|
|
╭─[5]─Stash────────────────────────────────╮│ │
|
|
│6s On main: My stash entry ││ │
|
|
╰───────────────────────────────────1 of 1─╯╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
Confirm: <enter> | Close/Cancel: <esc> | Copy to clipboard: <c-o> Donate Ask Question 0.58.1
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
╭─[1]─Status───────────────────────────────╮╭─Unstaged changes────────────────────────────────────────────────────────────────────╮
|
|
│lazygit-keys-test → main ││ │
|
|
╰──────────────────────────────────────────╯│ │
|
|
╭─[2]─Files - Worktrees - Submodules───────╮│ │
|
|
│▼ / ││ │
|
|
│ M file1.txt ││ │
|
|
│ M file2.txt ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
╰───────────────────────────────────2 of 3─╯│ │
|
|
╭─[3]─Local branches - Re╭───────────────────────────────────────────────────────────────────────────────╮────────────────────────╯
|
|
│ * main │Hunk selection mode is now the default for staging. If you want to stage │────────────────────────╮
|
|
│10s feature │individual lines, press 'a' to switch to line-by-line mode. │ ▐
|
|
│ │ │ ▐
|
|
│ │If you prefer to use line-by-line mode by default (like in earlier lazygit │ ▐
|
|
│ │versions), add │ ▐
|
|
│ │ │ ▐
|
|
│ │gui: │ ▐
|
|
│ │ useHunkModeInStagingView: false │ ▐
|
|
│ │ │ ▐
|
|
│ │to your lazygit config. │ ▐
|
|
│ ╰───────────────────────────────────────────────────────────────────────────────╯ ▐
|
|
╰───────────────────────────────────1 of 2─╯│ ▐
|
|
╭─[4]─Commits - Reflog─────────────────────╮│ ▐
|
|
│3dafa1cf Te ◯ Initial commit ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ │╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
│ │╭─Command log─────────────────────────────────────────────────────────────────────────╮
|
|
│ ││You can hide/focus this panel by pressing '@' │
|
|
│ ││ │
|
|
│ ││Random tip: You can page through the items of a panel using ',' and '.' │
|
|
│ ││Stage file │
|
|
│ ││ git add -- file1.txt │
|
|
╰───────────────────────────────────1 of 1─╯│ │
|
|
╭─[5]─Stash────────────────────────────────╮│ │
|
|
│6s On main: My stash entry ││ │
|
|
╰───────────────────────────────────1 of 1─╯╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
Confirm: <enter> | Close/Cancel: <esc> | Copy to clipboard: <c-o> Donate Ask Question 0.58.1
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
╭─[1]─Status───────────────────────────────╮╭─Unstaged changes────────────────────────────────────────────────────────────────────╮
|
|
│lazygit-keys-test → main ││ │
|
|
╰──────────────────────────────────────────╯│ │
|
|
╭─[2]─Files - Worktrees - Submodules───────╮│ │
|
|
│▼ / ││ │
|
|
│ M file1.txt ││ │
|
|
│ M file2.txt ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
╰───────────────────────────────────2 of 3─╯│ │
|
|
╭─[3]─Local branches - Re╭───────────────────────────────────────────────────────────────────────────────╮────────────────────────╯
|
|
│ * main │Hunk selection mode is now the default for staging. If you want to stage │────────────────────────╮
|
|
│10s feature │individual lines, press 'a' to switch to line-by-line mode. │ ▐
|
|
│ │ │ ▐
|
|
│ │If you prefer to use line-by-line mode by default (like in earlier lazygit │ ▐
|
|
│ │versions), add │ ▐
|
|
│ │ │ ▐
|
|
│ │gui: │ ▐
|
|
│ │ useHunkModeInStagingView: false │ ▐
|
|
│ │ │ ▐
|
|
│ │to your lazygit config. │ ▐
|
|
│ ╰───────────────────────────────────────────────────────────────────────────────╯ ▐
|
|
╰───────────────────────────────────1 of 2─╯│ ▐
|
|
╭─[4]─Commits - Reflog─────────────────────╮│ ▐
|
|
│3dafa1cf Te ◯ Initial commit ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ │╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
│ │╭─Command log─────────────────────────────────────────────────────────────────────────╮
|
|
│ ││You can hide/focus this panel by pressing '@' │
|
|
│ ││ │
|
|
│ ││Random tip: You can page through the items of a panel using ',' and '.' │
|
|
│ ││Stage file │
|
|
│ ││ git add -- file1.txt │
|
|
╰───────────────────────────────────1 of 1─╯│ │
|
|
╭─[5]─Stash────────────────────────────────╮│ │
|
|
│6s On main: My stash entry ││ │
|
|
╰───────────────────────────────────1 of 1─╯╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
Confirm: <enter> | Close/Cancel: <esc> | Copy to clipboard: <c-o> Donate Ask Question 0.58.1
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
╭─[1]─Status───────────────────────────────╮╭─Unstaged changes────────────────────────────────────────────────────────────────────╮
|
|
│lazygit-keys-test → main ││ │
|
|
╰──────────────────────────────────────────╯│ │
|
|
╭─[2]─Files - Worktrees - Submodules───────╮│ │
|
|
│▼ / ││ │
|
|
│ M file1.txt ││ │
|
|
│ M file2.txt ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
╰───────────────────────────────────2 of 3─╯│ │
|
|
╭─[3]─Local branches - Re╭───────────────────────────────────────────────────────────────────────────────╮────────────────────────╯
|
|
│ * main │Hunk selection mode is now the default for staging. If you want to stage │────────────────────────╮
|
|
│10s feature │individual lines, press 'a' to switch to line-by-line mode. │ ▐
|
|
│ │ │ ▐
|
|
│ │If you prefer to use line-by-line mode by default (like in earlier lazygit │ ▐
|
|
│ │versions), add │ ▐
|
|
│ │ │ ▐
|
|
│ │gui: │ ▐
|
|
│ │ useHunkModeInStagingView: false │ ▐
|
|
│ │ │ ▐
|
|
│ │to your lazygit config. │ ▐
|
|
│ ╰───────────────────────────────────────────────────────────────────────────────╯ ▐
|
|
╰───────────────────────────────────1 of 2─╯│ ▐
|
|
╭─[4]─Commits - Reflog─────────────────────╮│ ▐
|
|
│3dafa1cf Te ◯ Initial commit ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ │╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
│ │╭─Command log─────────────────────────────────────────────────────────────────────────╮
|
|
│ ││You can hide/focus this panel by pressing '@' │
|
|
│ ││ │
|
|
│ ││Random tip: You can page through the items of a panel using ',' and '.' │
|
|
│ ││Stage file │
|
|
│ ││ git add -- file1.txt │
|
|
╰───────────────────────────────────1 of 1─╯│ │
|
|
╭─[5]─Stash────────────────────────────────╮│ │
|
|
│6s On main: My stash entry ││ │
|
|
╰───────────────────────────────────1 of 1─╯╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
Confirm: <enter> | Close/Cancel: <esc> | Copy to clipboard: <c-o> Donate Ask Question 0.58.1
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
╭─[1]─Status───────────────────────────────╮╭─Unstaged changes────────────────────────────────────────────────────────────────────╮
|
|
│lazygit-keys-test → main ││ │
|
|
╰──────────────────────────────────────────╯│ │
|
|
╭─[2]─Files - Worktrees - Submodules───────╮│ │
|
|
│▼ / ││ │
|
|
│ M file1.txt ││ │
|
|
│ M file2.txt ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
╰───────────────────────────────────2 of 3─╯│ │
|
|
╭─[3]─Local branches - Remotes - Tags──────╮╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
│ * main │╭─Staged changes──────────────────────────────────────────────────────────────────────╮
|
|
│10s feature ││diff --git a/file1.txt b/file1.txt ▐
|
|
│ ││index e79c5e8..40e29ef 100644 ▐
|
|
│ ││--- a/file1.txt ▐
|
|
│ ││+++ b/file1.txt ▐
|
|
│ ││@@ -1,1 +1,2 @@ ▐
|
|
│ ││ initial ▐
|
|
│ ││+unstaged change ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
╰───────────────────────────────────1 of 2─╯│ ▐
|
|
╭─[4]─Commits - Reflog─────────────────────╮│ ▐
|
|
│3dafa1cf Te ◯ Initial commit ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ │╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
│ │╭─Command log─────────────────────────────────────────────────────────────────────────╮
|
|
│ ││You can hide/focus this panel by pressing '@' │
|
|
│ ││ │
|
|
│ ││Random tip: You can page through the items of a panel using ',' and '.' │
|
|
│ ││Stage file │
|
|
│ ││ git add -- file1.txt │
|
|
╰───────────────────────────────────1 of 1─╯│ │
|
|
╭─[5]─Stash────────────────────────────────╮│ │
|
|
│6s On main: My stash entry ││ │
|
|
╰───────────────────────────────────1 of 1─╯╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
Select line-by-line: a | Stage: <space> | Discard: d | Return to files panel: <esc> | … Donate Ask Question 0.58.1
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
╭─[1]─Status───────────────────────────────╮╭─Unstaged changes────────────────────────────────────────────────────────────────────╮
|
|
│lazygit-keys-test → main ││ │
|
|
╰──────────────────────────────────────────╯│ │
|
|
╭─[2]─Files - Worktrees - Submodules───────╮│ │
|
|
│▼ / ││ │
|
|
│ M file1.txt ││ │
|
|
│ M file2.txt ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
╰───────────────────────────────────2 of 3─╯│ │
|
|
╭─[3]─Local branches - Remotes - Tags──────╮╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
│ * main │╭─Staged changes──────────────────────────────────────────────────────────────────────╮
|
|
│10s feature ││diff --git a/file1.txt b/file1.txt ▐
|
|
│ ││index e79c5e8..40e29ef 100644 ▐
|
|
│ ││--- a/file1.txt ▐
|
|
│ ││+++ b/file1.txt ▐
|
|
│ ││@@ -1,1 +1,2 @@ ▐
|
|
│ ││ initial ▐
|
|
│ ││+unstaged change ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
╰───────────────────────────────────1 of 2─╯│ ▐
|
|
╭─[4]─Commits - Reflog─────────────────────╮│ ▐
|
|
│3dafa1cf Te ◯ Initial commit ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ │╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
│ │╭─Command log─────────────────────────────────────────────────────────────────────────╮
|
|
│ ││You can hide/focus this panel by pressing '@' │
|
|
│ ││ │
|
|
│ ││Random tip: You can page through the items of a panel using ',' and '.' │
|
|
│ ││Stage file │
|
|
│ ││ git add -- file1.txt │
|
|
╰───────────────────────────────────1 of 1─╯│ │
|
|
╭─[5]─Stash────────────────────────────────╮│ │
|
|
│6s On main: My stash entry ││ │
|
|
╰───────────────────────────────────1 of 1─╯╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
Select line-by-line: a | Stage: <space> | Discard: d | Return to files panel: <esc> | … Donate Ask Question 0.58.1
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
╭─[1]─Status───────────────────────────────╮╭─[0]─Log─────────────────────────────────────────────────────────────────────────────╮
|
|
│lazygit-keys-test → main ││* commit 3dafa1c (HEAD -> main) ▐
|
|
╰──────────────────────────────────────────╯│ Author: Test <test@test.com> ▐
|
|
╭─[2]─Files - Worktrees - Submodules───────╮│ Date: 24 seconds ago ▐
|
|
│▼ / ││ ▐
|
|
│ M file1.txt ││ Initial commit ▐
|
|
│ M file2.txt ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
╰───────────────────────────────────2 of 3─╯│ ▐
|
|
╭─[3]─Local branches - Remotes - Tags──────╮│ ▐
|
|
│ * main ││ ▐
|
|
│10s feature ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
╰───────────────────────────────────1 of 2─╯│ ▐
|
|
╭─[4]─Commits - Reflog─────────────────────╮│ ▐
|
|
│3dafa1cf Te ◯ Initial commit ││ ▐
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ │╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
│ │╭─Command log─────────────────────────────────────────────────────────────────────────╮
|
|
│ ││You can hide/focus this panel by pressing '@' │
|
|
│ ││ │
|
|
│ ││Random tip: You can page through the items of a panel using ',' and '.' │
|
|
│ ││Stage file │
|
|
│ ││ git add -- file1.txt │
|
|
╰───────────────────────────────────1 of 1─╯│ │
|
|
╭─[5]─Stash────────────────────────────────╮│ │
|
|
│6s On main: My stash entry ││ │
|
|
╰───────────────────────────────────1 of 1─╯╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
Checkout: <space> | New branch: n | Delete: d | Rebase: r | Reset: g | Upstream: u | Keybindings: ? Donate Ask Question 0.58.1
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
╭─[1]─Status───────────────────────────────╮╭─[0]─Log─────────────────────────────────────────────────────────────────────────────╮
|
|
│lazygit-keys-test → main ││* commit 3dafa1c (HEAD -> main) ▐
|
|
╰──────────────────────────────────────────╯│ Author: Test <test@test.com> ▐
|
|
╭─[2]─Files - Worktrees - Submodules───────╮│ Date: 24 seconds ago ▐
|
|
│▼ / ││ ▐
|
|
│ M file1.txt ││ Initial commit ▐
|
|
│ M file2.txt ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
╰───────────────────────────────────2 of 3─╯│ ▐
|
|
╭─[3]─Local branches - Remotes - Tags──────╮│ ▐
|
|
│ * main ││ ▐
|
|
│10s feature ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
╰───────────────────────────────────1 of 2─╯│ ▐
|
|
╭─[4]─Commits - Reflog─────────────────────╮│ ▐
|
|
│3dafa1cf Te ◯ Initial commit ││ ▐
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ │╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
│ │╭─Command log─────────────────────────────────────────────────────────────────────────╮
|
|
│ ││You can hide/focus this panel by pressing '@' │
|
|
│ ││ │
|
|
│ ││Random tip: You can page through the items of a panel using ',' and '.' │
|
|
│ ││Stage file │
|
|
│ ││ git add -- file1.txt │
|
|
╰───────────────────────────────────1 of 1─╯│ │
|
|
╭─[5]─Stash────────────────────────────────╮│ │
|
|
│6s On main: My stash entry ││ │
|
|
╰───────────────────────────────────1 of 1─╯╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
Checkout: <space> | New branch: n | Delete: d | Rebase: r | Reset: g | Upstream: u | Keybindings: ? Donate Ask Question 0.58.1
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
╭─[1]─Status───────────────────────────────╮╭─[0]─Log─────────────────────────────────────────────────────────────────────────────╮
|
|
│lazygit-keys-test → main ││* commit 3dafa1c (HEAD -> main) ▐
|
|
╰──────────────────────────────────────────╯│ Author: Test <test@test.com> ▐
|
|
╭─[2]─Files - Worktrees - Submodules───────╮│ Date: 24 seconds ago ▐
|
|
│▼ / ││ ▐
|
|
│ M file1.txt ││ Initial commit ▐
|
|
│ M file2.txt ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
╰───────────────────────────────────2 of 3─╯│ ▐
|
|
╭─[3]─Local branches - Remotes - Tags──────╮│ ▐
|
|
│ * main ││ ▐
|
|
│10s feature ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
╰───────────────────────────────────1 of 2─╯│ ▐
|
|
╭─[4]─Commits - Reflog─────────────────────╮│ ▐
|
|
│3dafa1cf Te ◯ Initial commit ││ ▐
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ │╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
│ │╭─Command log─────────────────────────────────────────────────────────────────────────╮
|
|
│ ││You can hide/focus this panel by pressing '@' │
|
|
│ ││ │
|
|
│ ││Random tip: You can page through the items of a panel using ',' and '.' │
|
|
│ ││Stage file │
|
|
│ ││ git add -- file1.txt │
|
|
╰───────────────────────────────────1 of 1─╯│ │
|
|
╭─[5]─Stash────────────────────────────────╮│ │
|
|
│6s On main: My stash entry ││ │
|
|
╰───────────────────────────────────1 of 1─╯╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
Checkout: <space> | New branch: n | Delete: d | Rebase: r | Reset: g | Upstream: u | Keybindings: ? Donate Ask Question 0.58.1
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
╭─[1]─Status───────────────────────────────╮╭─[0]─Log─────────────────────────────────────────────────────────────────────────────╮
|
|
│lazygit-keys-test → main ││* commit f50c712 (feature) ▐
|
|
╰──────────────────────────────────────────╯│| Author: Test <test@test.com> ▐
|
|
╭─[2]─Files - Worktrees - Submodules───────╮│| Date: 18 seconds ago ▐
|
|
│▼ / ││| ▐
|
|
│ M file1.txt ││| Feature work ▐
|
|
│ M file2.txt ││| ▐
|
|
│ ││* commit 3dafa1c (HEAD -> main) ▐
|
|
│ ││ Author: Test <test@test.com> ▐
|
|
│ ││ Date: 25 seconds ago ▐
|
|
│ ││ ▐
|
|
│ ││ Initial commit ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
╰───────────────────────────────────2 of 3─╯│ ▐
|
|
╭─[3]─Local branches - Remotes - Tags──────╮│ ▐
|
|
│ * main ││ ▐
|
|
│10s feature ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ │
|
|
╰───────────────────────────────────2 of 2─╯│ │
|
|
╭─[4]─Commits - Reflog─────────────────────╮│ │
|
|
│3dafa1cf Te ◯ Initial commit ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ │╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
│ │╭─Command log─────────────────────────────────────────────────────────────────────────╮
|
|
│ ││You can hide/focus this panel by pressing '@' │
|
|
│ ││ │
|
|
│ ││Random tip: You can page through the items of a panel using ',' and '.' │
|
|
│ ││Stage file │
|
|
│ ││ git add -- file1.txt │
|
|
╰───────────────────────────────────1 of 1─╯│ │
|
|
╭─[5]─Stash────────────────────────────────╮│ │
|
|
│6s On main: My stash entry ││ │
|
|
╰───────────────────────────────────1 of 1─╯╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
Checkout: <space> | New branch: n | Delete: d | Rebase: r | Merge: M | Reset: g | Upstream: u | … Donate Ask Question 0.58.1
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
╭─[1]─Status───────────────────────────────╮╭─[0]─Log─────────────────────────────────────────────────────────────────────────────╮
|
|
│lazygit-keys-test → main ││* commit f50c712 (feature) ▐
|
|
╰──────────────────────────────────────────╯│| Author: Test <test@test.com> ▐
|
|
╭─[2]─Files - Worktrees - Submodules───────╮│| Date: 18 seconds ago ▐
|
|
│▼ / ││| ▐
|
|
│ M file1.txt ││| Feature work ▐
|
|
│ M file2.txt ││| ▐
|
|
│ ││* commit 3dafa1c (HEAD -> main) ▐
|
|
│ ││ Author: Test <test@test.com> ▐
|
|
│ ││ Date: 25 seconds ago ▐
|
|
│ ││ ▐
|
|
│ ││ Initial commit ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
╰───────────────────────────────────2 of 3─╯│ ▐
|
|
╭─[3]─Local branches - Remotes - Tags──────╮│ ▐
|
|
│ * main ││ ▐
|
|
│10s feature ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ │
|
|
╰───────────────────────────────────2 of 2─╯│ │
|
|
╭─[4]─Commits - Reflog─────────────────────╮│ │
|
|
│3dafa1cf Te ◯ Initial commit ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ │╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
│ │╭─Command log─────────────────────────────────────────────────────────────────────────╮
|
|
│ ││You can hide/focus this panel by pressing '@' │
|
|
│ ││ │
|
|
│ ││Random tip: You can page through the items of a panel using ',' and '.' │
|
|
│ ││Stage file │
|
|
│ ││ git add -- file1.txt │
|
|
╰───────────────────────────────────1 of 1─╯│ │
|
|
╭─[5]─Stash────────────────────────────────╮│ │
|
|
│6s On main: My stash entry ││ │
|
|
╰───────────────────────────────────1 of 1─╯╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
Checkout: <space> | New branch: n | Delete: d | Rebase: r | Merge: M | Reset: g | Upstream: u | … Donate Ask Question 0.58.1
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
╭─[1]─Status───────────────────────────────╮╭─[0]─Log─────────────────────────────────────────────────────────────────────────────╮
|
|
│lazygit-keys-test → main ││* commit f50c712 (feature) ▐
|
|
╰──────────────────────────────────────────╯│| Author: Test <test@test.com> ▐
|
|
╭─[2]─Files - Worktrees - Submodules───────╮│| Date: 18 seconds ago ▐
|
|
│▼ / ││| ▐
|
|
│ M file1.txt ││| Feature work ▐
|
|
│ M file2.txt ││| ▐
|
|
│ ││* commit 3dafa1c (HEAD -> main) ▐
|
|
│ ││ Author: Test <test@test.com> ▐
|
|
│ ││ Date: 25 seconds ago ▐
|
|
│ ││ ▐
|
|
│ ││ Initial commit ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
╰───────────────────────────────────2 of 3─╯│ ▐
|
|
╭─[3]─Local branches - Remotes - Tags──────╮│ ▐
|
|
│ * main ││ ▐
|
|
│10s feature ││ ▐
|
|
│ ││ ▐
|
|
│ ╭─Autostash?────────────────────────────────────────────────────────────────────╮ ▐
|
|
│ │You must stash and pop your changes to bring them across. Do this │ ▐
|
|
│ │automatically? (enter/esc) │ ▐
|
|
│ ╰───────────────────────────────────────────────────────────────────────────────╯ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ │
|
|
╰───────────────────────────────────2 of 2─╯│ │
|
|
╭─[4]─Commits - Reflog─────────────────────╮│ │
|
|
│3dafa1cf Te ◯ Initial commit ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ │╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
│ │╭─Command log─────────────────────────────────────────────────────────────────────────╮
|
|
│ ││You can hide/focus this panel by pressing '@' │
|
|
│ ││ │
|
|
│ ││Random tip: You can page through the items of a panel using ',' and '.' │
|
|
│ ││Stage file │
|
|
│ ││ git add -- file1.txt │
|
|
╰───────────────────────────────────1 of 1─╯│Checkout branch │
|
|
╭─[5]─Stash────────────────────────────────╮│ git checkout feature │
|
|
│6s On main: My stash entry ││ │
|
|
╰───────────────────────────────────1 of 1─╯╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
Confirm: <enter> | Close/Cancel: <esc> | Copy to clipboard: <c-o> Donate Ask Question 0.58.1
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
╭─[1]─Status───────────────────────────────╮╭─[0]─Log─────────────────────────────────────────────────────────────────────────────╮
|
|
│lazygit-keys-test → main ││* commit f50c712 (feature) ▐
|
|
╰──────────────────────────────────────────╯│| Author: Test <test@test.com> ▐
|
|
╭─[2]─Files - Worktrees - Submodules───────╮│| Date: 18 seconds ago ▐
|
|
│▼ / ││| ▐
|
|
│ M file1.txt ││| Feature work ▐
|
|
│ M file2.txt ││| ▐
|
|
│ ││* commit 3dafa1c (HEAD -> main) ▐
|
|
│ ││ Author: Test <test@test.com> ▐
|
|
│ ││ Date: 25 seconds ago ▐
|
|
│ ││ ▐
|
|
│ ││ Initial commit ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
╰───────────────────────────────────2 of 3─╯│ ▐
|
|
╭─[3]─Local branches - Remotes - Tags──────╮│ ▐
|
|
│ * main ││ ▐
|
|
│10s feature ││ ▐
|
|
│ ││ ▐
|
|
│ ╭─Autostash?────────────────────────────────────────────────────────────────────╮ ▐
|
|
│ │You must stash and pop your changes to bring them across. Do this │ ▐
|
|
│ │automatically? (enter/esc) │ ▐
|
|
│ ╰───────────────────────────────────────────────────────────────────────────────╯ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ │
|
|
╰───────────────────────────────────2 of 2─╯│ │
|
|
╭─[4]─Commits - Reflog─────────────────────╮│ │
|
|
│3dafa1cf Te ◯ Initial commit ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ │╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
│ │╭─Command log─────────────────────────────────────────────────────────────────────────╮
|
|
│ ││You can hide/focus this panel by pressing '@' │
|
|
│ ││ │
|
|
│ ││Random tip: You can page through the items of a panel using ',' and '.' │
|
|
│ ││Stage file │
|
|
│ ││ git add -- file1.txt │
|
|
╰───────────────────────────────────1 of 1─╯│Checkout branch │
|
|
╭─[5]─Stash────────────────────────────────╮│ git checkout feature │
|
|
│6s On main: My stash entry ││ │
|
|
╰───────────────────────────────────1 of 1─╯╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
Confirm: <enter> | Close/Cancel: <esc> | Copy to clipboard: <c-o> Donate Ask Question 0.58.1
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
╭─[1]─Status───────────────────────────────╮╭─[0]─Log─────────────────────────────────────────────────────────────────────────────╮
|
|
│lazygit-keys-test → main ││* commit f50c712 (feature) ▐
|
|
╰──────────────────────────────────────────╯│| Author: Test <test@test.com> ▐
|
|
╭─[2]─Files - Worktrees - Submodules───────╮│| Date: 18 seconds ago ▐
|
|
│▼ / ││| ▐
|
|
│ M file1.txt ││| Feature work ▐
|
|
│ M file2.txt ││| ▐
|
|
│ ││* commit 3dafa1c (HEAD -> main) ▐
|
|
│ ││ Author: Test <test@test.com> ▐
|
|
│ ││ Date: 25 seconds ago ▐
|
|
│ ││ ▐
|
|
│ ││ Initial commit ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
╰───────────────────────────────────2 of 3─╯│ ▐
|
|
╭─[3]─Local branches - Remotes - Tags──────╮│ ▐
|
|
│ * main ││ ▐
|
|
│10s feature ││ ▐
|
|
│ ││ ▐
|
|
│ ╭─Autostash?────────────────────────────────────────────────────────────────────╮ ▐
|
|
│ │You must stash and pop your changes to bring them across. Do this │ ▐
|
|
│ │automatically? (enter/esc) │ ▐
|
|
│ ╰───────────────────────────────────────────────────────────────────────────────╯ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ │
|
|
╰───────────────────────────────────2 of 2─╯│ │
|
|
╭─[4]─Commits - Reflog─────────────────────╮│ │
|
|
│3dafa1cf Te ◯ Initial commit ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ │╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
│ │╭─Command log─────────────────────────────────────────────────────────────────────────╮
|
|
│ ││You can hide/focus this panel by pressing '@' │
|
|
│ ││ │
|
|
│ ││Random tip: You can page through the items of a panel using ',' and '.' │
|
|
│ ││Stage file │
|
|
│ ││ git add -- file1.txt │
|
|
╰───────────────────────────────────1 of 1─╯│Checkout branch │
|
|
╭─[5]─Stash────────────────────────────────╮│ git checkout feature │
|
|
│6s On main: My stash entry ││ │
|
|
╰───────────────────────────────────1 of 1─╯╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
Confirm: <enter> | Close/Cancel: <esc> | Copy to clipboard: <c-o> Donate Ask Question 0.58.1
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
╭─[1]─Status───────────────────────────────╮╭─[0]─Log─────────────────────────────────────────────────────────────────────────────╮
|
|
│lazygit-keys-test → main ││* commit f50c712 (feature) ▐
|
|
╰──────────────────────────────────────────╯│| Author: Test <test@test.com> ▐
|
|
╭─[2]─Files - Worktrees - Submodules───────╮│| Date: 18 seconds ago ▐
|
|
│▼ / ││| ▐
|
|
│ M file1.txt ││| Feature work ▐
|
|
│ M file2.txt ││| ▐
|
|
│ ││* commit 3dafa1c (HEAD -> main) ▐
|
|
│ ││ Author: Test <test@test.com> ▐
|
|
│ ││ Date: 25 seconds ago ▐
|
|
│ ││ ▐
|
|
│ ││ Initial commit ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
╰───────────────────────────────────2 of 3─╯│ ▐
|
|
╭─[3]─Local branches - Remotes - Tags──────╮│ ▐
|
|
│ * main ││ ▐
|
|
│10s feature ││ ▐
|
|
│ ││ ▐
|
|
│ ╭─Autostash?────────────────────────────────────────────────────────────────────╮ ▐
|
|
│ │You must stash and pop your changes to bring them across. Do this │ ▐
|
|
│ │automatically? (enter/esc) │ ▐
|
|
│ ╰───────────────────────────────────────────────────────────────────────────────╯ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ │
|
|
╰───────────────────────────────────2 of 2─╯│ │
|
|
╭─[4]─Commits - Reflog─────────────────────╮│ │
|
|
│3dafa1cf Te ◯ Initial commit ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ │╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
│ │╭─Command log─────────────────────────────────────────────────────────────────────────╮
|
|
│ ││You can hide/focus this panel by pressing '@' │
|
|
│ ││ │
|
|
│ ││Random tip: You can page through the items of a panel using ',' and '.' │
|
|
│ ││Stage file │
|
|
│ ││ git add -- file1.txt │
|
|
╰───────────────────────────────────1 of 1─╯│Checkout branch │
|
|
╭─[5]─Stash────────────────────────────────╮│ git checkout feature │
|
|
│6s On main: My stash entry ││ │
|
|
╰───────────────────────────────────1 of 1─╯╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
Confirm: <enter> | Close/Cancel: <esc> | Copy to clipboard: <c-o> Donate Ask Question 0.58.1
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
╭─[1]─Status───────────────────────────────╮╭─[0]─Log─────────────────────────────────────────────────────────────────────────────╮
|
|
│lazygit-keys-test → main ││* commit f50c712 (feature) ▐
|
|
╰──────────────────────────────────────────╯│| Author: Test <test@test.com> ▐
|
|
╭─[2]─Files - Worktrees - Submodules───────╮│| Date: 18 seconds ago ▐
|
|
│▼ / ││| ▐
|
|
│ M file1.txt ││| Feature work ▐
|
|
│ M file2.txt ││| ▐
|
|
│ ││* commit 3dafa1c (HEAD -> main) ▐
|
|
│ ││ Author: Test <test@test.com> ▐
|
|
│ ││ Date: 25 seconds ago ▐
|
|
│ ││ ▐
|
|
│ ││ Initial commit ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
╰───────────────────────────────────2 of 3─╯│ ▐
|
|
╭─[3]─Local branches - Remotes - Tags──────╮│ ▐
|
|
│ * main ││ ▐
|
|
│10s feature ││ ▐
|
|
│ ││ ▐
|
|
│ ╭─Autostash?────────────────────────────────────────────────────────────────────╮ ▐
|
|
│ │You must stash and pop your changes to bring them across. Do this │ ▐
|
|
│ │automatically? (enter/esc) │ ▐
|
|
│ ╰───────────────────────────────────────────────────────────────────────────────╯ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ │
|
|
╰───────────────────────────────────2 of 2─╯│ │
|
|
╭─[4]─Commits - Reflog─────────────────────╮│ │
|
|
│3dafa1cf Te ◯ Initial commit ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ │╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
│ │╭─Command log─────────────────────────────────────────────────────────────────────────╮
|
|
│ ││You can hide/focus this panel by pressing '@' │
|
|
│ ││ │
|
|
│ ││Random tip: You can page through the items of a panel using ',' and '.' │
|
|
│ ││Stage file │
|
|
│ ││ git add -- file1.txt │
|
|
╰───────────────────────────────────1 of 1─╯│Checkout branch │
|
|
╭─[5]─Stash────────────────────────────────╮│ git checkout feature │
|
|
│6s On main: My stash entry ││ │
|
|
╰───────────────────────────────────1 of 1─╯╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
Confirm: <enter> | Close/Cancel: <esc> | Copy to clipboard: <c-o> Donate Ask Question 0.58.1
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
╭─[1]─Status───────────────────────────────╮╭─[0]─Log─────────────────────────────────────────────────────────────────────────────╮
|
|
│lazygit-keys-test → main ││* commit f50c712 (feature) ▐
|
|
╰──────────────────────────────────────────╯│| Author: Test <test@test.com> ▐
|
|
╭─[2]─Files - Worktrees - Submodules───────╮│| Date: 18 seconds ago ▐
|
|
│▼ / ││| ▐
|
|
│ M file1.txt ││| Feature work ▐
|
|
│ M file2.txt ││| ▐
|
|
│ ││* commit 3dafa1c (HEAD -> main) ▐
|
|
│ ││ Author: Test <test@test.com> ▐
|
|
│ ││ Date: 25 seconds ago ▐
|
|
│ ││ ▐
|
|
│ ││ Initial commit ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
╰───────────────────────────────────2 of 3─╯│ ▐
|
|
╭─[3]─Local branches - Remotes - Tags──────╮│ ▐
|
|
│ * main ││ ▐
|
|
│10s feature ││ ▐
|
|
│ ││ ▐
|
|
│ ╭─Autostash?────────────────────────────────────────────────────────────────────╮ ▐
|
|
│ │You must stash and pop your changes to bring them across. Do this │ ▐
|
|
│ │automatically? (enter/esc) │ ▐
|
|
│ ╰───────────────────────────────────────────────────────────────────────────────╯ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ │
|
|
╰───────────────────────────────────2 of 2─╯│ │
|
|
╭─[4]─Commits - Reflog─────────────────────╮│ │
|
|
│3dafa1cf Te ◯ Initial commit ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ │╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
│ │╭─Command log─────────────────────────────────────────────────────────────────────────╮
|
|
│ ││You can hide/focus this panel by pressing '@' │
|
|
│ ││ │
|
|
│ ││Random tip: You can page through the items of a panel using ',' and '.' │
|
|
│ ││Stage file │
|
|
│ ││ git add -- file1.txt │
|
|
╰───────────────────────────────────1 of 1─╯│Checkout branch │
|
|
╭─[5]─Stash────────────────────────────────╮│ git checkout feature │
|
|
│6s On main: My stash entry ││ │
|
|
╰───────────────────────────────────1 of 1─╯╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
Confirm: <enter> | Close/Cancel: <esc> | Copy to clipboard: <c-o> Donate Ask Question 0.58.1
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
╭─[1]─Status───────────────────────────────╮╭─[0]─Log─────────────────────────────────────────────────────────────────────────────╮
|
|
│lazygit-keys-test → main ││* commit f50c712 (feature) ▐
|
|
╰──────────────────────────────────────────╯│| Author: Test <test@test.com> ▐
|
|
╭─[2]─Files - Worktrees - Submodules───────╮│| Date: 18 seconds ago ▐
|
|
│▼ / ││| ▐
|
|
│ M file1.txt ││| Feature work ▐
|
|
│ M file2.txt ││| ▐
|
|
│ ││* commit 3dafa1c (HEAD -> main) ▐
|
|
│ ││ Author: Test <test@test.com> ▐
|
|
│ ││ Date: 25 seconds ago ▐
|
|
│ ││ ▐
|
|
│ ││ Initial commit ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
╰───────────────────────────────────2 of 3─╯│ ▐
|
|
╭─[3]─Local branches - Remotes - Tags──────╮│ ▐
|
|
│ * main ││ ▐
|
|
│10s feature ││ ▐
|
|
│ ││ ▐
|
|
│ ╭─Autostash?────────────────────────────────────────────────────────────────────╮ ▐
|
|
│ │You must stash and pop your changes to bring them across. Do this │ ▐
|
|
│ │automatically? (enter/esc) │ ▐
|
|
│ ╰───────────────────────────────────────────────────────────────────────────────╯ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ │
|
|
╰───────────────────────────────────2 of 2─╯│ │
|
|
╭─[4]─Commits - Reflog─────────────────────╮│ │
|
|
│3dafa1cf Te ◯ Initial commit ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ │╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
│ │╭─Command log─────────────────────────────────────────────────────────────────────────╮
|
|
│ ││You can hide/focus this panel by pressing '@' │
|
|
│ ││ │
|
|
│ ││Random tip: You can page through the items of a panel using ',' and '.' │
|
|
│ ││Stage file │
|
|
│ ││ git add -- file1.txt │
|
|
╰───────────────────────────────────1 of 1─╯│Checkout branch │
|
|
╭─[5]─Stash────────────────────────────────╮│ git checkout feature │
|
|
│6s On main: My stash entry ││ │
|
|
╰───────────────────────────────────1 of 1─╯╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
Confirm: <enter> | Close/Cancel: <esc> | Copy to clipboard: <c-o> Donate Ask Question 0.58.1
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
╭─[1]─Status───────────────────────────────╮╭─[0]─Log─────────────────────────────────────────────────────────────────────────────╮
|
|
│lazygit-keys-test → main ││* commit f50c712 (feature) ▐
|
|
╰──────────────────────────────────────────╯│| Author: Test <test@test.com> ▐
|
|
╭─[2]─Files - Worktrees - Submodules───────╮│| Date: 18 seconds ago ▐
|
|
│▼ / ││| ▐
|
|
│ M file1.txt ││| Feature work ▐
|
|
│ M file2.txt ││| ▐
|
|
│ ││* commit 3dafa1c (HEAD -> main) ▐
|
|
│ ││ Author: Test <test@test.com> ▐
|
|
│ ││ Date: 25 seconds ago ▐
|
|
│ ││ ▐
|
|
│ ││ Initial commit ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
╰───────────────────────────────────2 of 3─╯│ ▐
|
|
╭─[3]─Local branches - Remotes - Tags──────╮│ ▐
|
|
│ * main ││ ▐
|
|
│10s feature ││ ▐
|
|
│ ││ ▐
|
|
│ ╭─Autostash?────────────────────────────────────────────────────────────────────╮ ▐
|
|
│ │You must stash and pop your changes to bring them across. Do this │ ▐
|
|
│ │automatically? (enter/esc) │ ▐
|
|
│ ╰───────────────────────────────────────────────────────────────────────────────╯ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ │
|
|
╰───────────────────────────────────2 of 2─╯│ │
|
|
╭─[4]─Commits - Reflog─────────────────────╮│ │
|
|
│3dafa1cf Te ◯ Initial commit ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ │╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
│ │╭─Command log─────────────────────────────────────────────────────────────────────────╮
|
|
│ ││You can hide/focus this panel by pressing '@' │
|
|
│ ││ │
|
|
│ ││Random tip: You can page through the items of a panel using ',' and '.' │
|
|
│ ││Stage file │
|
|
│ ││ git add -- file1.txt │
|
|
╰───────────────────────────────────1 of 1─╯│Checkout branch │
|
|
╭─[5]─Stash────────────────────────────────╮│ git checkout feature │
|
|
│6s On main: My stash entry ││ │
|
|
╰───────────────────────────────────1 of 1─╯╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
Confirm: <enter> | Close/Cancel: <esc> | Copy to clipboard: <c-o> Donate Ask Question 0.58.1
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
╭─[1]─Status───────────────────────────────╮╭─[0]─Log─────────────────────────────────────────────────────────────────────────────╮
|
|
│lazygit-keys-test → main ││* commit f50c712 (feature) ▐
|
|
╰──────────────────────────────────────────╯│| Author: Test <test@test.com> ▐
|
|
╭─[2]─Files - Worktrees - Submodules───────╮│| Date: 18 seconds ago ▐
|
|
│▼ / ││| ▐
|
|
│ M file1.txt ││| Feature work ▐
|
|
│ M file2.txt ││| ▐
|
|
│ ││* commit 3dafa1c (HEAD -> main) ▐
|
|
│ ││ Author: Test <test@test.com> ▐
|
|
│ ││ Date: 25 seconds ago ▐
|
|
│ ││ ▐
|
|
│ ││ Initial commit ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
╰───────────────────────────────────2 of 3─╯│ ▐
|
|
╭─[3]─Local branches - Remotes - Tags──────╮│ ▐
|
|
│ * main ││ ▐
|
|
│10s feature ││ ▐
|
|
│ ││ ▐
|
|
│ ╭─Autostash?────────────────────────────────────────────────────────────────────╮ ▐
|
|
│ │You must stash and pop your changes to bring them across. Do this │ ▐
|
|
│ │automatically? (enter/esc) │ ▐
|
|
│ ╰───────────────────────────────────────────────────────────────────────────────╯ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ │
|
|
╰───────────────────────────────────2 of 2─╯│ │
|
|
╭─[4]─Commits - Reflog─────────────────────╮│ │
|
|
│3dafa1cf Te ◯ Initial commit ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ │╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
│ │╭─Command log─────────────────────────────────────────────────────────────────────────╮
|
|
│ ││You can hide/focus this panel by pressing '@' │
|
|
│ ││ │
|
|
│ ││Random tip: You can page through the items of a panel using ',' and '.' │
|
|
│ ││Stage file │
|
|
│ ││ git add -- file1.txt │
|
|
╰───────────────────────────────────1 of 1─╯│Checkout branch │
|
|
╭─[5]─Stash────────────────────────────────╮│ git checkout feature │
|
|
│6s On main: My stash entry ││ │
|
|
╰───────────────────────────────────1 of 1─╯╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
Confirm: <enter> | Close/Cancel: <esc> | Copy to clipboard: <c-o> Donate Ask Question 0.58.1
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
╭─[1]─Status───────────────────────────────╮╭─[0]─Log─────────────────────────────────────────────────────────────────────────────╮
|
|
│lazygit-keys-test → feature ││* commit f50c712 (HEAD -> feature) ▐
|
|
╰──────────────────────────────────────────╯│| Author: Test <test@test.com> ▐
|
|
╭─[2]─Files - Worktr(only conflicting)─────╮│| Date: 22 seconds ago ▐
|
|
│UU file1.txt ││| ▐
|
|
│ ││| Feature work ▐
|
|
│ ││| ▐
|
|
│ ││* commit 3dafa1c (main) ▐
|
|
│ ││ Author: Test <test@test.com> ▐
|
|
│ ││ Date: 29 seconds ago ▐
|
|
│ ││ ▐
|
|
│ ││ Initial commit ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ╭─Error─────────────────────────────────────────────────────────────────────────╮ ▐
|
|
╰────────────────────────│Auto-merging file1.txt │ ▐
|
|
╭─[3]─Local branches - Re│CONFLICT (content): Merge conflict in file1.txt │ ▐
|
|
│ * feature │On branch feature │ ▐
|
|
│29s main │Changes to be committed: │ ▐
|
|
│ │ (use "git restore --staged <file>..." to unstage) │ ▐
|
|
│ │ modified: file2.txt │ ▐
|
|
│ │ │ ▐
|
|
│ │Unmerged paths: │ ▐
|
|
│ │ (use "git restore --staged <file>..." to unstage) │ ▐
|
|
│ │ (use "git add <file>..." to mark resolution) │ ▐
|
|
│ │ both modified: file1.txt │ ▐
|
|
│ │ │ ▐
|
|
│ │The stash entry is kept in case you need it again. │ │
|
|
╰────────────────────────╰───────────────────────────────────────────────────────────────────────────────╯ │
|
|
╭─[4]─Commits - Reflog─────────────────────╮│ │
|
|
│f50c712e Te ◯ Feature work ││ │
|
|
│3dafa1cf Te ◯ Initial commit ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ │╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
│ │╭─Command log─────────────────────────────────────────────────────────────────────────╮
|
|
│ ││Random tip: You can page through the items of a panel using ',' and '.' │
|
|
│ ││Stage file │
|
|
│ ││ git add -- file1.txt ▐
|
|
│ ││Checkout branch ▐
|
|
│ ││ git checkout feature ▐
|
|
╰───────────────────────────────────1 of 2─╯│ git stash push -m "Auto-stashing changes for checking out feature" ▐
|
|
╭─[5]─Stash────────────────────────────────╮│ git checkout feature ▐
|
|
│0s On main: Auto-stashing changes for che││ git stash pop refs/stash@{0} ▐
|
|
╰───────────────────────────────────1 of 2─╯╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
Confirm: <enter> | Close/Cancel: <esc> | Copy to clipboard: <c-o> Donate Ask Question 0.58.1
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
╭─[1]─Status───────────────────────────────╮╭─[0]─Log─────────────────────────────────────────────────────────────────────────────╮
|
|
│lazygit-keys-test → feature ││* commit f50c712 (HEAD -> feature) ▐
|
|
╰──────────────────────────────────────────╯│| Author: Test <test@test.com> ▐
|
|
╭─[2]─Files - Worktr(only conflicting)─────╮│| Date: 22 seconds ago ▐
|
|
│UU file1.txt ││| ▐
|
|
│ ││| Feature work ▐
|
|
│ ││| ▐
|
|
│ ││* commit 3dafa1c (main) ▐
|
|
│ ││ Author: Test <test@test.com> ▐
|
|
│ ││ Date: 29 seconds ago ▐
|
|
│ ││ ▐
|
|
│ ││ Initial commit ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ╭─Error─────────────────────────────────────────────────────────────────────────╮ ▐
|
|
╰────────────────────────│Auto-merging file1.txt │ ▐
|
|
╭─[3]─Local branches - Re│CONFLICT (content): Merge conflict in file1.txt │ ▐
|
|
│ * feature │On branch feature │ ▐
|
|
│29s main │Changes to be committed: │ ▐
|
|
│ │ (use "git restore --staged <file>..." to unstage) │ ▐
|
|
│ │ modified: file2.txt │ ▐
|
|
│ │ │ ▐
|
|
│ │Unmerged paths: │ ▐
|
|
│ │ (use "git restore --staged <file>..." to unstage) │ ▐
|
|
│ │ (use "git add <file>..." to mark resolution) │ ▐
|
|
│ │ both modified: file1.txt │ ▐
|
|
│ │ │ ▐
|
|
│ │The stash entry is kept in case you need it again. │ │
|
|
╰────────────────────────╰───────────────────────────────────────────────────────────────────────────────╯ │
|
|
╭─[4]─Commits - Reflog─────────────────────╮│ │
|
|
│f50c712e Te ◯ Feature work ││ │
|
|
│3dafa1cf Te ◯ Initial commit ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ │╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
│ │╭─Command log─────────────────────────────────────────────────────────────────────────╮
|
|
│ ││Random tip: You can page through the items of a panel using ',' and '.' │
|
|
│ ││Stage file │
|
|
│ ││ git add -- file1.txt ▐
|
|
│ ││Checkout branch ▐
|
|
│ ││ git checkout feature ▐
|
|
╰───────────────────────────────────1 of 2─╯│ git stash push -m "Auto-stashing changes for checking out feature" ▐
|
|
╭─[5]─Stash────────────────────────────────╮│ git checkout feature ▐
|
|
│0s On main: Auto-stashing changes for che││ git stash pop refs/stash@{0} ▐
|
|
╰───────────────────────────────────1 of 2─╯╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
Confirm: <enter> | Close/Cancel: <esc> | Copy to clipboard: <c-o> Donate Ask Question 0.58.1
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
╭─[1]─Status───────────────────────────────╮╭─[0]─Log─────────────────────────────────────────────────────────────────────────────╮
|
|
│lazygit-keys-test → feature ││* commit f50c712 (HEAD -> feature) ▐
|
|
╰──────────────────────────────────────────╯│| Author: Test <test@test.com> ▐
|
|
╭─[2]─Files - Worktr(only conflicting)─────╮│| Date: 22 seconds ago ▐
|
|
│UU file1.txt ││| ▐
|
|
│ ││| Feature work ▐
|
|
│ ││| ▐
|
|
│ ││* commit 3dafa1c (main) ▐
|
|
│ ││ Author: Test <test@test.com> ▐
|
|
│ ││ Date: 29 seconds ago ▐
|
|
│ ││ ▐
|
|
│ ││ Initial commit ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ╭─Error─────────────────────────────────────────────────────────────────────────╮ ▐
|
|
╰────────────────────────│Auto-merging file1.txt │ ▐
|
|
╭─[3]─Local branches - Re│CONFLICT (content): Merge conflict in file1.txt │ ▐
|
|
│ * feature │On branch feature │ ▐
|
|
│29s main │Changes to be committed: │ ▐
|
|
│ │ (use "git restore --staged <file>..." to unstage) │ ▐
|
|
│ │ modified: file2.txt │ ▐
|
|
│ │ │ ▐
|
|
│ │Unmerged paths: │ ▐
|
|
│ │ (use "git restore --staged <file>..." to unstage) │ ▐
|
|
│ │ (use "git add <file>..." to mark resolution) │ ▐
|
|
│ │ both modified: file1.txt │ ▐
|
|
│ │ │ ▐
|
|
│ │The stash entry is kept in case you need it again. │ │
|
|
╰────────────────────────╰───────────────────────────────────────────────────────────────────────────────╯ │
|
|
╭─[4]─Commits - Reflog─────────────────────╮│ │
|
|
│f50c712e Te ◯ Feature work ││ │
|
|
│3dafa1cf Te ◯ Initial commit ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ │╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
│ │╭─Command log─────────────────────────────────────────────────────────────────────────╮
|
|
│ ││Random tip: You can page through the items of a panel using ',' and '.' │
|
|
│ ││Stage file │
|
|
│ ││ git add -- file1.txt ▐
|
|
│ ││Checkout branch ▐
|
|
│ ││ git checkout feature ▐
|
|
╰───────────────────────────────────1 of 2─╯│ git stash push -m "Auto-stashing changes for checking out feature" ▐
|
|
╭─[5]─Stash────────────────────────────────╮│ git checkout feature ▐
|
|
│0s On main: Auto-stashing changes for che││ git stash pop refs/stash@{0} ▐
|
|
╰───────────────────────────────────1 of 2─╯╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
Confirm: <enter> | Close/Cancel: <esc> | Copy to clipboard: <c-o> Donate Ask Question 0.58.1
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
╭─[1]─Status───────────────────────────────╮╭─[0]─Log─────────────────────────────────────────────────────────────────────────────╮
|
|
│lazygit-keys-test → feature ││* commit f50c712 (HEAD -> feature) ▐
|
|
╰──────────────────────────────────────────╯│| Author: Test <test@test.com> ▐
|
|
╭─[2]─Files - Worktr(only conflicting)─────╮│| Date: 22 seconds ago ▐
|
|
│UU file1.txt ││| ▐
|
|
│ ││| Feature work ▐
|
|
│ ││| ▐
|
|
│ ││* commit 3dafa1c (main) ▐
|
|
│ ││ Author: Test <test@test.com> ▐
|
|
│ ││ Date: 29 seconds ago ▐
|
|
│ ││ ▐
|
|
│ ││ Initial commit ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ╭─Error─────────────────────────────────────────────────────────────────────────╮ ▐
|
|
╰────────────────────────│Auto-merging file1.txt │ ▐
|
|
╭─[3]─Local branches - Re│CONFLICT (content): Merge conflict in file1.txt │ ▐
|
|
│ * feature │On branch feature │ ▐
|
|
│29s main │Changes to be committed: │ ▐
|
|
│ │ (use "git restore --staged <file>..." to unstage) │ ▐
|
|
│ │ modified: file2.txt │ ▐
|
|
│ │ │ ▐
|
|
│ │Unmerged paths: │ ▐
|
|
│ │ (use "git restore --staged <file>..." to unstage) │ ▐
|
|
│ │ (use "git add <file>..." to mark resolution) │ ▐
|
|
│ │ both modified: file1.txt │ ▐
|
|
│ │ │ ▐
|
|
│ │The stash entry is kept in case you need it again. │ │
|
|
╰────────────────────────╰───────────────────────────────────────────────────────────────────────────────╯ │
|
|
╭─[4]─Commits - Reflog─────────────────────╮│ │
|
|
│f50c712e Te ◯ Feature work ││ │
|
|
│3dafa1cf Te ◯ Initial commit ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ │╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
│ │╭─Command log─────────────────────────────────────────────────────────────────────────╮
|
|
│ ││Random tip: You can page through the items of a panel using ',' and '.' │
|
|
│ ││Stage file │
|
|
│ ││ git add -- file1.txt ▐
|
|
│ ││Checkout branch ▐
|
|
│ ││ git checkout feature ▐
|
|
╰───────────────────────────────────1 of 2─╯│ git stash push -m "Auto-stashing changes for checking out feature" ▐
|
|
╭─[5]─Stash────────────────────────────────╮│ git checkout feature ▐
|
|
│0s On main: Auto-stashing changes for che││ git stash pop refs/stash@{0} ▐
|
|
╰───────────────────────────────────1 of 2─╯╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
Confirm: <enter> | Close/Cancel: <esc> | Copy to clipboard: <c-o> Donate Ask Question 0.58.1
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
╭─[1]─Status───────────────────────────────╮╭─[0]─Log─────────────────────────────────────────────────────────────────────────────╮
|
|
│lazygit-keys-test → feature ││* commit f50c712 (HEAD -> feature) ▐
|
|
╰──────────────────────────────────────────╯│| Author: Test <test@test.com> ▐
|
|
╭─[2]─Files - Worktr(only conflicting)─────╮│| Date: 23 seconds ago ▐
|
|
│UU file1.txt ││| ▐
|
|
│ ││| Feature work ▐
|
|
│ ││| ▐
|
|
│ ││* commit 3dafa1c (main) ▐
|
|
│ ││ Author: Test <test@test.com> ▐
|
|
│ ││ Date: 30 seconds ago ▐
|
|
│ ││ ▐
|
|
│ ││ Initial commit ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
╰───────────────────────────────────1 of 1─╯│ ▐
|
|
╭─[3]─Local branches - Remotes - Tags──────╮│ ▐
|
|
│ * feature ││ ▐
|
|
│29s main ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ │
|
|
╰───────────────────────────────────1 of 2─╯│ │
|
|
╭─[4]─Commits - Reflog─────────────────────╮│ │
|
|
│f50c712e Te ◯ Feature work ││ │
|
|
│3dafa1cf Te ◯ Initial commit ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ │╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
│ │╭─Command log─────────────────────────────────────────────────────────────────────────╮
|
|
│ ││Random tip: You can page through the items of a panel using ',' and '.' │
|
|
│ ││Stage file │
|
|
│ ││ git add -- file1.txt ▐
|
|
│ ││Checkout branch ▐
|
|
│ ││ git checkout feature ▐
|
|
╰───────────────────────────────────1 of 2─╯│ git stash push -m "Auto-stashing changes for checking out feature" ▐
|
|
╭─[5]─Stash────────────────────────────────╮│ git checkout feature ▐
|
|
│0s On main: Auto-stashing changes for che││ git stash pop refs/stash@{0} ▐
|
|
╰───────────────────────────────────1 of 2─╯╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
Checkout: <space> | New branch: n | Delete: d | Rebase: r | Reset: g | Upstream: u | Keybindings: ? Donate Ask Question 0.58.1
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
╭─[1]─Status───────────────────────────────╮╭─[0]─Log─────────────────────────────────────────────────────────────────────────────╮
|
|
│lazygit-keys-test → feature ││* commit f50c712 (HEAD -> feature) ▐
|
|
╰──────────────────────────────────────────╯│| Author: Test <test@test.com> ▐
|
|
╭─[2]─Files - Worktr(only conflicting)─────╮│| Date: 23 seconds ago ▐
|
|
│UU file1.txt ││| ▐
|
|
│ ││| Feature work ▐
|
|
│ ││| ▐
|
|
│ ││* commit 3dafa1c (main) ▐
|
|
│ ││ Author: Test <test@test.com> ▐
|
|
│ ││ Date: 30 seconds ago ▐
|
|
│ ││ ▐
|
|
│ ││ Initial commit ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
╰───────────────────────────────────1 of 1─╯│ ▐
|
|
╭─[3]─Local branches - Remotes - Tags──────╮│ ▐
|
|
│ * feature ││ ▐
|
|
│29s main ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ │
|
|
╰───────────────────────────────────1 of 2─╯│ │
|
|
╭─[4]─Commits - Reflog─────────────────────╮│ │
|
|
│f50c712e Te ◯ Feature work ││ │
|
|
│3dafa1cf Te ◯ Initial commit ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ │╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
│ │╭─Command log─────────────────────────────────────────────────────────────────────────╮
|
|
│ ││Random tip: You can page through the items of a panel using ',' and '.' │
|
|
│ ││Stage file │
|
|
│ ││ git add -- file1.txt ▐
|
|
│ ││Checkout branch ▐
|
|
│ ││ git checkout feature ▐
|
|
╰───────────────────────────────────1 of 2─╯│ git stash push -m "Auto-stashing changes for checking out feature" ▐
|
|
╭─[5]─Stash────────────────────────────────╮│ git checkout feature ▐
|
|
│0s On main: Auto-stashing changes for che││ git stash pop refs/stash@{0} ▐
|
|
╰───────────────────────────────────1 of 2─╯╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
Checkout: <space> | New branch: n | Delete: d | Rebase: r | Reset: g | Upstream: u | Keybindings: ? Donate Ask Question 0.58.1
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
╭─[1]─Status───────────────────────────────╮╭─[0]─Patch───────────────────────────────────────────────────────────────────────────╮
|
|
│lazygit-keys-test → feature ││commit f50c712e23900355c4051a2e91145637fa0dcb9c (HEAD -> feature) ▐
|
|
╰──────────────────────────────────────────╯│Author: Test <test@test.com> ▐
|
|
╭─[2]─Files - Worktr(only conflicting)─────╮│Date: Wed Jan 21 17:59:42 2026 -0500 ▐
|
|
│UU file1.txt ││ ▐
|
|
│ ││ Feature work ▐
|
|
│ ││--- ▐
|
|
│ ││ file1.txt | 1 + ▐
|
|
│ ││ 1 file changed, 1 insertion(+) ▐
|
|
│ ││ ▐
|
|
│ ││diff --git a/file1.txt b/file1.txt ▐
|
|
│ ││index e79c5e8..6103cde 100644 ▐
|
|
│ ││--- a/file1.txt ▐
|
|
│ ││+++ b/file1.txt ▐
|
|
│ ││@@ -1 +1,2 @@ ▐
|
|
│ ││ initial ▐
|
|
╰───────────────────────────────────1 of 1─╯│+feature ▐
|
|
╭─[3]─Local branches - Remotes - Tags──────╮│ ▐
|
|
│ * feature ││ ▐
|
|
│29s main ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
╰───────────────────────────────────1 of 2─╯│ │
|
|
╭─[4]─Commits - Reflog─────────────────────╮│ │
|
|
│f50c712e Te ◯ Feature work ││ │
|
|
│3dafa1cf Te ◯ Initial commit ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ │╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
│ │╭─Command log─────────────────────────────────────────────────────────────────────────╮
|
|
│ ││Random tip: You can page through the items of a panel using ',' and '.' │
|
|
│ ││Stage file │
|
|
│ ││ git add -- file1.txt ▐
|
|
│ ││Checkout branch ▐
|
|
│ ││ git checkout feature ▐
|
|
╰───────────────────────────────────1 of 2─╯│ git stash push -m "Auto-stashing changes for checking out feature" ▐
|
|
╭─[5]─Stash────────────────────────────────╮│ git checkout feature ▐
|
|
│0s On main: Auto-stashing changes for che││ git stash pop refs/stash@{0} ▐
|
|
╰───────────────────────────────────1 of 2─╯╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
Squash: s | Fixup: f | Reword: r | Drop: d | Edit: e | Amend: A | Checkout: <space> | Reset: g | … Donate Ask Question 0.58.1
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
╭─[1]─Status───────────────────────────────╮╭─[0]─Patch───────────────────────────────────────────────────────────────────────────╮
|
|
│lazygit-keys-test → feature ││commit f50c712e23900355c4051a2e91145637fa0dcb9c (HEAD -> feature) ▐
|
|
╰──────────────────────────────────────────╯│Author: Test <test@test.com> ▐
|
|
╭─[2]─Files - Worktr(only conflicting)─────╮│Date: Wed Jan 21 17:59:42 2026 -0500 ▐
|
|
│UU file1.txt ││ ▐
|
|
│ ││ Feature work ▐
|
|
│ ││--- ▐
|
|
│ ││ file1.txt | 1 + ▐
|
|
│ ││ 1 file changed, 1 insertion(+) ▐
|
|
│ ││ ▐
|
|
│ ││diff --git a/file1.txt b/file1.txt ▐
|
|
│ ││index e79c5e8..6103cde 100644 ▐
|
|
│ ││--- a/file1.txt ▐
|
|
│ ││+++ b/file1.txt ▐
|
|
│ ││@@ -1 +1,2 @@ ▐
|
|
│ ││ initial ▐
|
|
╰───────────────────────────────────1 of 1─╯│+feature ▐
|
|
╭─[3]─Local branches - Remotes - Tags──────╮│ ▐
|
|
│ * feature ││ ▐
|
|
│29s main ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
╰───────────────────────────────────1 of 2─╯│ │
|
|
╭─[4]─Commits - Reflog─────────────────────╮│ │
|
|
│f50c712e Te ◯ Feature work ││ │
|
|
│3dafa1cf Te ◯ Initial commit ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ │╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
│ │╭─Command log─────────────────────────────────────────────────────────────────────────╮
|
|
│ ││Random tip: You can page through the items of a panel using ',' and '.' │
|
|
│ ││Stage file │
|
|
│ ││ git add -- file1.txt ▐
|
|
│ ││Checkout branch ▐
|
|
│ ││ git checkout feature ▐
|
|
╰───────────────────────────────────1 of 2─╯│ git stash push -m "Auto-stashing changes for checking out feature" ▐
|
|
╭─[5]─Stash────────────────────────────────╮│ git checkout feature ▐
|
|
│0s On main: Auto-stashing changes for che││ git stash pop refs/stash@{0} ▐
|
|
╰───────────────────────────────────1 of 2─╯╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
Squash: s | Fixup: f | Reword: r | Drop: d | Edit: e | Amend: A | Checkout: <space> | Reset: g | … Donate Ask Question 0.58.1
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
╭─[1]─Status───────────────────────────────╮╭─[0]─Patch───────────────────────────────────────────────────────────────────────────╮
|
|
│lazygit-keys-test → feature ││commit f50c712e23900355c4051a2e91145637fa0dcb9c (HEAD -> feature) ▐
|
|
╰──────────────────────────────────────────╯│Author: Test <test@test.com> ▐
|
|
╭─[2]─Files - Worktr(only conflicting)─────╮│Date: Wed Jan 21 17:59:42 2026 -0500 ▐
|
|
│UU file1.txt ││ ▐
|
|
│ ││ Feature work ▐
|
|
│ ││--- ▐
|
|
│ ││ file1.txt | 1 + ▐
|
|
│ ││ 1 file changed, 1 insertion(+) ▐
|
|
│ ││ ▐
|
|
│ ││diff --git a/file1.txt b/file1.txt ▐
|
|
│ ││index e79c5e8..6103cde 100644 ▐
|
|
│ ││--- a/file1.txt ▐
|
|
│ ││+++ b/file1.txt ▐
|
|
│ ││@@ -1 +1,2 @@ ▐
|
|
│ ││ initial ▐
|
|
╰───────────────────────────────────1 of 1─╯│+feature ▐
|
|
╭─[3]─Local branches - Remotes - Tags──────╮│ ▐
|
|
│ * feature ││ ▐
|
|
│29s main ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
╰───────────────────────────────────1 of 2─╯│ │
|
|
╭─[4]─Commits - Reflog─────────────────────╮│ │
|
|
│f50c712e Te ◯ Feature work ││ │
|
|
│3dafa1cf Te ◯ Initial commit ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ │╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
│ │╭─Command log─────────────────────────────────────────────────────────────────────────╮
|
|
│ ││Random tip: You can page through the items of a panel using ',' and '.' │
|
|
│ ││Stage file │
|
|
│ ││ git add -- file1.txt ▐
|
|
│ ││Checkout branch ▐
|
|
│ ││ git checkout feature ▐
|
|
╰───────────────────────────────────1 of 2─╯│ git stash push -m "Auto-stashing changes for checking out feature" ▐
|
|
╭─[5]─Stash────────────────────────────────╮│ git checkout feature ▐
|
|
│0s On main: Auto-stashing changes for che││ git stash pop refs/stash@{0} ▐
|
|
╰───────────────────────────────────1 of 2─╯╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
Squash: s | Fixup: f | Reword: r | Drop: d | Edit: e | Amend: A | Checkout: <space> | Reset: g | … Donate Ask Question 0.58.1
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
╭─[1]─Status───────────────────────────────╮╭─[0]─Patch───────────────────────────────────────────────────────────────────────────╮
|
|
│lazygit-keys-test → feature ││commit f50c712e23900355c4051a2e91145637fa0dcb9c (HEAD -> feature) ▐
|
|
╰──────────────────────────────────────────╯│Author: Test <test@test.com> ▐
|
|
╭─[2]─Files - Worktr(only conflicting)─────╮│Date: Wed Jan 21 17:59:42 2026 -0500 ▐
|
|
│UU file1.txt ││ ▐
|
|
│ ││ Feature work ▐
|
|
│ ││--- ▐
|
|
│ ││ file1.txt | 1 + ▐
|
|
│ ││ 1 file changed, 1 insertion(+) ▐
|
|
│ ││ ▐
|
|
│ ││diff --git a/file1.txt b/file1.txt ▐
|
|
│ ││index e79c5e8..6103cde 100644 ▐
|
|
│ ││--- a/file1.txt ▐
|
|
│ ││+++ b/file1.txt ▐
|
|
│ ││@@ -1 +1,2 @@ ▐
|
|
│ ││ initial ▐
|
|
╰───────────────────────────────────1 of 1─╯│+feature ▐
|
|
╭─[3]─Local branches - Remotes - Tags──────╮│ ▐
|
|
│ * feature ││ ▐
|
|
│29s main ╭─Checkout branch or commit─────────────────────────────────────────────────────╮ ▐
|
|
│ │d Checkout commit f50c712e as detached head │ ▐
|
|
│ │1 Checkout branch │ ▐
|
|
│ │ Cancel │ ▐
|
|
│ ╰────────────────────────────────────────────────────────────────────────1 of 3─╯ ▐
|
|
│ ││ ▐
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
╰───────────────────────────────────1 of 2─╯│ │
|
|
╭─[4]─Commits - Reflog─────────────────────╮│ │
|
|
│f50c712e Te ◯ Feature work ││ │
|
|
│3dafa1cf Te ◯ Initial commit ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ │╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
│ │╭─Command log─────────────────────────────────────────────────────────────────────────╮
|
|
│ ││Random tip: You can page through the items of a panel using ',' and '.' │
|
|
│ ││Stage file │
|
|
│ ││ git add -- file1.txt ▐
|
|
│ ││Checkout branch ▐
|
|
│ ││ git checkout feature ▐
|
|
╰───────────────────────────────────1 of 2─╯│ git stash push -m "Auto-stashing changes for checking out feature" ▐
|
|
╭─[5]─Stash────────────────────────────────╮│ git checkout feature ▐
|
|
│0s On main: Auto-stashing changes for che││ git stash pop refs/stash@{0} ▐
|
|
╰───────────────────────────────────1 of 2─╯╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
Execute: <enter> | Close/Cancel: <esc> Donate Ask Question 0.58.1
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
╭─[1]─Status───────────────────────────────╮╭─[0]─Patch───────────────────────────────────────────────────────────────────────────╮
|
|
│lazygit-keys-test → feature ││commit f50c712e23900355c4051a2e91145637fa0dcb9c (HEAD -> feature) ▐
|
|
╰──────────────────────────────────────────╯│Author: Test <test@test.com> ▐
|
|
╭─[2]─Files - Worktr(only conflicting)─────╮│Date: Wed Jan 21 17:59:42 2026 -0500 ▐
|
|
│UU file1.txt ││ ▐
|
|
│ ││ Feature work ▐
|
|
│ ││--- ▐
|
|
│ ││ file1.txt | 1 + ▐
|
|
│ ││ 1 file changed, 1 insertion(+) ▐
|
|
│ ││ ▐
|
|
│ ││diff --git a/file1.txt b/file1.txt ▐
|
|
│ ││index e79c5e8..6103cde 100644 ▐
|
|
│ ││--- a/file1.txt ▐
|
|
│ ││+++ b/file1.txt ▐
|
|
│ ││@@ -1 +1,2 @@ ▐
|
|
│ ││ initial ▐
|
|
╰───────────────────────────────────1 of 1─╯│+feature ▐
|
|
╭─[3]─Local branches - Remotes - Tags──────╮│ ▐
|
|
│ * feature ││ ▐
|
|
│29s main ╭─Checkout branch or commit─────────────────────────────────────────────────────╮ ▐
|
|
│ │d Checkout commit f50c712e as detached head │ ▐
|
|
│ │1 Checkout branch │ ▐
|
|
│ │ Cancel │ ▐
|
|
│ ╰────────────────────────────────────────────────────────────────────────1 of 3─╯ ▐
|
|
│ ││ ▐
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
╰───────────────────────────────────1 of 2─╯│ │
|
|
╭─[4]─Commits - Reflog─────────────────────╮│ │
|
|
│f50c712e Te ◯ Feature work ││ │
|
|
│3dafa1cf Te ◯ Initial commit ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ │╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
│ │╭─Command log─────────────────────────────────────────────────────────────────────────╮
|
|
│ ││Random tip: You can page through the items of a panel using ',' and '.' │
|
|
│ ││Stage file │
|
|
│ ││ git add -- file1.txt ▐
|
|
│ ││Checkout branch ▐
|
|
│ ││ git checkout feature ▐
|
|
╰───────────────────────────────────1 of 2─╯│ git stash push -m "Auto-stashing changes for checking out feature" ▐
|
|
╭─[5]─Stash────────────────────────────────╮│ git checkout feature ▐
|
|
│0s On main: Auto-stashing changes for che││ git stash pop refs/stash@{0} ▐
|
|
╰───────────────────────────────────1 of 2─╯╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
Execute: <enter> | Close/Cancel: <esc> Donate Ask Question 0.58.1
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
╭─[1]─Status───────────────────────────────╮╭─[0]─Patch───────────────────────────────────────────────────────────────────────────╮
|
|
│lazygit-keys-test → feature ││commit f50c712e23900355c4051a2e91145637fa0dcb9c (HEAD -> feature) ▐
|
|
╰──────────────────────────────────────────╯│Author: Test <test@test.com> ▐
|
|
╭─[2]─Files - Worktr(only conflicting)─────╮│Date: Wed Jan 21 17:59:42 2026 -0500 ▐
|
|
│UU file1.txt ││ ▐
|
|
│ ││ Feature work ▐
|
|
│ ││--- ▐
|
|
│ ││ file1.txt | 1 + ▐
|
|
│ ││ 1 file changed, 1 insertion(+) ▐
|
|
│ ││ ▐
|
|
│ ││diff --git a/file1.txt b/file1.txt ▐
|
|
│ ││index e79c5e8..6103cde 100644 ▐
|
|
│ ││--- a/file1.txt ▐
|
|
│ ││+++ b/file1.txt ▐
|
|
│ ││@@ -1 +1,2 @@ ▐
|
|
│ ││ initial ▐
|
|
╰───────────────────────────────────1 of 1─╯│+feature ▐
|
|
╭─[3]─Local branches - Remotes - Tags──────╮│ ▐
|
|
│ * feature ││ ▐
|
|
│29s main ╭─Checkout branch or commit─────────────────────────────────────────────────────╮ ▐
|
|
│ │d Checkout commit f50c712e as detached head │ ▐
|
|
│ │1 Checkout branch │ ▐
|
|
│ │ Cancel │ ▐
|
|
│ ╰────────────────────────────────────────────────────────────────────────1 of 3─╯ ▐
|
|
│ ││ ▐
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
╰───────────────────────────────────1 of 2─╯│ │
|
|
╭─[4]─Commits - Reflog─────────────────────╮│ │
|
|
│f50c712e Te ◯ Feature work ││ │
|
|
│3dafa1cf Te ◯ Initial commit ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ │╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
│ │╭─Command log─────────────────────────────────────────────────────────────────────────╮
|
|
│ ││Random tip: You can page through the items of a panel using ',' and '.' │
|
|
│ ││Stage file │
|
|
│ ││ git add -- file1.txt ▐
|
|
│ ││Checkout branch ▐
|
|
│ ││ git checkout feature ▐
|
|
╰───────────────────────────────────1 of 2─╯│ git stash push -m "Auto-stashing changes for checking out feature" ▐
|
|
╭─[5]─Stash────────────────────────────────╮│ git checkout feature ▐
|
|
│0s On main: Auto-stashing changes for che││ git stash pop refs/stash@{0} ▐
|
|
╰───────────────────────────────────1 of 2─╯╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
Execute: <enter> | Close/Cancel: <esc> Donate Ask Question 0.58.1
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
╭─[1]─Status───────────────────────────────╮╭─[0]─Log─────────────────────────────────────────────────────────────────────────────╮
|
|
│lazygit-keys-test → feature ││* commit f50c712 (HEAD -> feature) ▐
|
|
╰──────────────────────────────────────────╯│| Author: Test <test@test.com> ▐
|
|
╭─[2]─Files - Worktr(only conflicting)─────╮│| Date: 26 seconds ago ▐
|
|
│UU file1.txt ││| ▐
|
|
│ ││| Feature work ▐
|
|
│ ││| ▐
|
|
│ ││* commit 3dafa1c (main) ▐
|
|
│ ││ Author: Test <test@test.com> ▐
|
|
│ ││ Date: 33 seconds ago ▐
|
|
│ ││ ▐
|
|
│ ││ Initial commit ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
╰───────────────────────────────────1 of 1─╯│ ▐
|
|
╭─[3]─Local branches - Remotes - Tags──────╮│ ▐
|
|
│ * feature ││ ▐
|
|
│33s main ││ ▐
|
|
│ ││ ▐
|
|
│ ╭─Error─────────────────────────────────────────────────────────────────────────╮ ▐
|
|
│ │error: you need to resolve your current index first │ ▐
|
|
│ │file1.txt: needs merge │ ▐
|
|
│ ╰───────────────────────────────────────────────────────────────────────────────╯ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ │
|
|
╰───────────────────────────────────1 of 2─╯│ │
|
|
╭─[4]─Commits - Reflog─────────────────────╮│ │
|
|
│f50c712e Te ◯ Feature work ││ │
|
|
│3dafa1cf Te ◯ Initial commit ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ │╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
│ │╭─Command log─────────────────────────────────────────────────────────────────────────╮
|
|
│ ││ git add -- file1.txt │
|
|
│ ││Checkout branch │
|
|
│ ││ git checkout feature │
|
|
│ ││ git stash push -m "Auto-stashing changes for checking out feature" ▐
|
|
│ ││ git checkout feature ▐
|
|
╰───────────────────────────────────1 of 2─╯│ git stash pop refs/stash@{0} ▐
|
|
╭─[5]─Stash────────────────────────────────╮│Checkout commit ▐
|
|
│4s On main: Auto-stashing changes for che││ git checkout f50c712e23900355c4051a2e91145637fa0dcb9c ▐
|
|
╰───────────────────────────────────1 of 2─╯╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
Confirm: <enter> | Close/Cancel: <esc> | Copy to clipboard: <c-o> Donate Ask Question 0.58.1
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
╭─[1]─Status───────────────────────────────╮╭─[0]─Log─────────────────────────────────────────────────────────────────────────────╮
|
|
│lazygit-keys-test → feature ││* commit f50c712 (HEAD -> feature) ▐
|
|
╰──────────────────────────────────────────╯│| Author: Test <test@test.com> ▐
|
|
╭─[2]─Files - Worktr(only conflicting)─────╮│| Date: 26 seconds ago ▐
|
|
│UU file1.txt ││| ▐
|
|
│ ││| Feature work ▐
|
|
│ ││| ▐
|
|
│ ││* commit 3dafa1c (main) ▐
|
|
│ ││ Author: Test <test@test.com> ▐
|
|
│ ││ Date: 33 seconds ago ▐
|
|
│ ││ ▐
|
|
│ ││ Initial commit ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
╰───────────────────────────────────1 of 1─╯│ ▐
|
|
╭─[3]─Local branches - Remotes - Tags──────╮│ ▐
|
|
│ * feature ││ ▐
|
|
│33s main ││ ▐
|
|
│ ││ ▐
|
|
│ ╭─Error─────────────────────────────────────────────────────────────────────────╮ ▐
|
|
│ │error: you need to resolve your current index first │ ▐
|
|
│ │file1.txt: needs merge │ ▐
|
|
│ ╰───────────────────────────────────────────────────────────────────────────────╯ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ │
|
|
╰───────────────────────────────────1 of 2─╯│ │
|
|
╭─[4]─Commits - Reflog─────────────────────╮│ │
|
|
│f50c712e Te ◯ Feature work ││ │
|
|
│3dafa1cf Te ◯ Initial commit ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ │╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
│ │╭─Command log─────────────────────────────────────────────────────────────────────────╮
|
|
│ ││ git add -- file1.txt │
|
|
│ ││Checkout branch │
|
|
│ ││ git checkout feature │
|
|
│ ││ git stash push -m "Auto-stashing changes for checking out feature" ▐
|
|
│ ││ git checkout feature ▐
|
|
╰───────────────────────────────────1 of 2─╯│ git stash pop refs/stash@{0} ▐
|
|
╭─[5]─Stash────────────────────────────────╮│Checkout commit ▐
|
|
│4s On main: Auto-stashing changes for che││ git checkout f50c712e23900355c4051a2e91145637fa0dcb9c ▐
|
|
╰───────────────────────────────────1 of 2─╯╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
Confirm: <enter> | Close/Cancel: <esc> | Copy to clipboard: <c-o> Donate Ask Question 0.58.1
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
╭─[1]─Status───────────────────────────────╮╭─[0]─Log─────────────────────────────────────────────────────────────────────────────╮
|
|
│lazygit-keys-test → feature ││* commit f50c712 (HEAD -> feature) ▐
|
|
╰──────────────────────────────────────────╯│| Author: Test <test@test.com> ▐
|
|
╭─[2]─Files - Worktr(only conflicting)─────╮│| Date: 26 seconds ago ▐
|
|
│UU file1.txt ││| ▐
|
|
│ ││| Feature work ▐
|
|
│ ││| ▐
|
|
│ ││* commit 3dafa1c (main) ▐
|
|
│ ││ Author: Test <test@test.com> ▐
|
|
│ ││ Date: 33 seconds ago ▐
|
|
│ ││ ▐
|
|
│ ││ Initial commit ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
╰───────────────────────────────────1 of 1─╯│ ▐
|
|
╭─[3]─Local branches - Remotes - Tags──────╮│ ▐
|
|
│ * feature ││ ▐
|
|
│33s main ││ ▐
|
|
│ ││ ▐
|
|
│ ╭─Error─────────────────────────────────────────────────────────────────────────╮ ▐
|
|
│ │error: you need to resolve your current index first │ ▐
|
|
│ │file1.txt: needs merge │ ▐
|
|
│ ╰───────────────────────────────────────────────────────────────────────────────╯ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ │
|
|
╰───────────────────────────────────1 of 2─╯│ │
|
|
╭─[4]─Commits - Reflog─────────────────────╮│ │
|
|
│f50c712e Te ◯ Feature work ││ │
|
|
│3dafa1cf Te ◯ Initial commit ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ │╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
│ │╭─Command log─────────────────────────────────────────────────────────────────────────╮
|
|
│ ││ git add -- file1.txt │
|
|
│ ││Checkout branch │
|
|
│ ││ git checkout feature │
|
|
│ ││ git stash push -m "Auto-stashing changes for checking out feature" ▐
|
|
│ ││ git checkout feature ▐
|
|
╰───────────────────────────────────1 of 2─╯│ git stash pop refs/stash@{0} ▐
|
|
╭─[5]─Stash────────────────────────────────╮│Checkout commit ▐
|
|
│4s On main: Auto-stashing changes for che││ git checkout f50c712e23900355c4051a2e91145637fa0dcb9c ▐
|
|
╰───────────────────────────────────1 of 2─╯╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
Confirm: <enter> | Close/Cancel: <esc> | Copy to clipboard: <c-o> Donate Ask Question 0.58.1
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
╭─[1]─Status───────────────────────────────╮╭─[0]─Log─────────────────────────────────────────────────────────────────────────────╮
|
|
│lazygit-keys-test → feature ││* commit f50c712 (HEAD -> feature) ▐
|
|
╰──────────────────────────────────────────╯│| Author: Test <test@test.com> ▐
|
|
╭─[2]─Files - Worktr(only conflicting)─────╮│| Date: 26 seconds ago ▐
|
|
│UU file1.txt ││| ▐
|
|
│ ││| Feature work ▐
|
|
│ ││| ▐
|
|
│ ││* commit 3dafa1c (main) ▐
|
|
│ ││ Author: Test <test@test.com> ▐
|
|
│ ││ Date: 33 seconds ago ▐
|
|
│ ││ ▐
|
|
│ ││ Initial commit ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
╰───────────────────────────────────1 of 1─╯│ ▐
|
|
╭─[3]─Local branches - Remotes - Tags──────╮│ ▐
|
|
│ * feature ││ ▐
|
|
│33s main ││ ▐
|
|
│ ││ ▐
|
|
│ ╭─Error─────────────────────────────────────────────────────────────────────────╮ ▐
|
|
│ │error: you need to resolve your current index first │ ▐
|
|
│ │file1.txt: needs merge │ ▐
|
|
│ ╰───────────────────────────────────────────────────────────────────────────────╯ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ │
|
|
╰───────────────────────────────────1 of 2─╯│ │
|
|
╭─[4]─Commits - Reflog─────────────────────╮│ │
|
|
│f50c712e Te ◯ Feature work ││ │
|
|
│3dafa1cf Te ◯ Initial commit ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ │╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
│ │╭─Command log─────────────────────────────────────────────────────────────────────────╮
|
|
│ ││ git add -- file1.txt │
|
|
│ ││Checkout branch │
|
|
│ ││ git checkout feature │
|
|
│ ││ git stash push -m "Auto-stashing changes for checking out feature" ▐
|
|
│ ││ git checkout feature ▐
|
|
╰───────────────────────────────────1 of 2─╯│ git stash pop refs/stash@{0} ▐
|
|
╭─[5]─Stash────────────────────────────────╮│Checkout commit ▐
|
|
│4s On main: Auto-stashing changes for che││ git checkout f50c712e23900355c4051a2e91145637fa0dcb9c ▐
|
|
╰───────────────────────────────────1 of 2─╯╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
Confirm: <enter> | Close/Cancel: <esc> | Copy to clipboard: <c-o> Donate Ask Question 0.58.1
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
╭─[1]─Status───────────────────────────────╮╭─[0]─Log─────────────────────────────────────────────────────────────────────────────╮
|
|
│lazygit-keys-test → feature ││* commit f50c712 (HEAD -> feature) ▐
|
|
╰──────────────────────────────────────────╯│| Author: Test <test@test.com> ▐
|
|
╭─[2]─Files - Worktr(only conflicting)─────╮│| Date: 27 seconds ago ▐
|
|
│UU file1.txt ││| ▐
|
|
│ ││| Feature work ▐
|
|
│ ││| ▐
|
|
│ ││* commit 3dafa1c (main) ▐
|
|
│ ││ Author: Test <test@test.com> ▐
|
|
│ ││ Date: 34 seconds ago ▐
|
|
│ ││ ▐
|
|
│ ││ Initial commit ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
╰───────────────────────────────────1 of 1─╯│ ▐
|
|
╭─[3]─Local branches - Remotes - Tags──────╮│ ▐
|
|
│ * feature ││ ▐
|
|
│33s main ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ │
|
|
╰───────────────────────────────────1 of 2─╯│ │
|
|
╭─[4]─Commits - Reflog─────────────────────╮│ │
|
|
│f50c712e Te ◯ Feature work ││ │
|
|
│3dafa1cf Te ◯ Initial commit ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ │╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
│ │╭─Command log─────────────────────────────────────────────────────────────────────────╮
|
|
│ ││ git add -- file1.txt │
|
|
│ ││Checkout branch │
|
|
│ ││ git checkout feature │
|
|
│ ││ git stash push -m "Auto-stashing changes for checking out feature" ▐
|
|
│ ││ git checkout feature ▐
|
|
╰───────────────────────────────────1 of 2─╯│ git stash pop refs/stash@{0} ▐
|
|
╭─[5]─Stash────────────────────────────────╮│Checkout commit ▐
|
|
│4s On main: Auto-stashing changes for che││ git checkout f50c712e23900355c4051a2e91145637fa0dcb9c ▐
|
|
╰───────────────────────────────────1 of 2─╯╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
Checkout: <space> | New branch: n | Delete: d | Rebase: r | Reset: g | Upstream: u | Keybindings: ? Donate Ask Question 0.58.1
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
╭─[1]─Status───────────────────────────────╮╭─[0]─Log─────────────────────────────────────────────────────────────────────────────╮
|
|
│lazygit-keys-test → feature ││* commit f50c712 (HEAD -> feature) ▐
|
|
╰──────────────────────────────────────────╯│| Author: Test <test@test.com> ▐
|
|
╭─[2]─Files - Worktr(only conflicting)─────╮│| Date: 27 seconds ago ▐
|
|
│UU file1.txt ││| ▐
|
|
│ ││| Feature work ▐
|
|
│ ││| ▐
|
|
│ ││* commit 3dafa1c (main) ▐
|
|
│ ││ Author: Test <test@test.com> ▐
|
|
│ ││ Date: 34 seconds ago ▐
|
|
│ ││ ▐
|
|
│ ││ Initial commit ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
╰───────────────────────────────────1 of 1─╯│ ▐
|
|
╭─[3]─Local branches - Remotes - Tags──────╮│ ▐
|
|
│ * feature ││ ▐
|
|
│33s main ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ │
|
|
╰───────────────────────────────────1 of 2─╯│ │
|
|
╭─[4]─Commits - Reflog─────────────────────╮│ │
|
|
│f50c712e Te ◯ Feature work ││ │
|
|
│3dafa1cf Te ◯ Initial commit ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ │╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
│ │╭─Command log─────────────────────────────────────────────────────────────────────────╮
|
|
│ ││ git add -- file1.txt │
|
|
│ ││Checkout branch │
|
|
│ ││ git checkout feature │
|
|
│ ││ git stash push -m "Auto-stashing changes for checking out feature" ▐
|
|
│ ││ git checkout feature ▐
|
|
╰───────────────────────────────────1 of 2─╯│ git stash pop refs/stash@{0} ▐
|
|
╭─[5]─Stash────────────────────────────────╮│Checkout commit ▐
|
|
│4s On main: Auto-stashing changes for che││ git checkout f50c712e23900355c4051a2e91145637fa0dcb9c ▐
|
|
╰───────────────────────────────────1 of 2─╯╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
Checkout: <space> | New branch: n | Delete: d | Rebase: r | Reset: g | Upstream: u | Keybindings: ? Donate Ask Question 0.58.1
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
╭─[1]─Status───────────────────────────────╮╭─[0]─Stash───────────────────────────────────────────────────────────────────────────╮
|
|
│lazygit-keys-test → feature ││stash@{0}: On main: Auto-stashing changes for checking out feature ▐
|
|
╰──────────────────────────────────────────╯│ ▐
|
|
╭─[2]─Files - Worktr(only conflicting)─────╮│ file1.txt | 1 + ▐
|
|
│UU file1.txt ││ file2.txt | 1 + ▐
|
|
│ ││ 2 files changed, 2 insertions(+) ▐
|
|
│ ││ ▐
|
|
│ ││diff --git a/file1.txt b/file1.txt ▐
|
|
│ ││index e79c5e8..40e29ef 100644 ▐
|
|
│ ││--- a/file1.txt ▐
|
|
│ ││+++ b/file1.txt ▐
|
|
│ ││@@ -1 +1,2 @@ ▐
|
|
│ ││ initial ▐
|
|
╰───────────────────────────────────1 of 1─╯│+unstaged change ▐
|
|
╭─[3]─Local branches - Remotes - Tags──────╮│diff --git a/file2.txt b/file2.txt ▐
|
|
│ * feature ││index e79c5e8..e5f18d7 100644 ▐
|
|
│33s main ││--- a/file2.txt ▐
|
|
│ ││+++ b/file2.txt ▐
|
|
│ ││@@ -1 +1,2 @@ ▐
|
|
│ ││ initial ▐
|
|
│ ││+staged change ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ │
|
|
╰───────────────────────────────────1 of 2─╯│ │
|
|
╭─[4]─Commits - Reflog─────────────────────╮│ │
|
|
│f50c712e Te ◯ Feature work ││ │
|
|
│3dafa1cf Te ◯ Initial commit ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
╰───────────────────────────────────1 of 2─╯╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
╭─[5]─Stash────────────────────────────────╮╭─Command log─────────────────────────────────────────────────────────────────────────╮
|
|
│4s On main: Auto-stashing changes for che││ git add -- file1.txt │
|
|
│22s On main: My stash entry ││Checkout branch │
|
|
│ ││ git checkout feature │
|
|
│ ││ git stash push -m "Auto-stashing changes for checking out feature" ▐
|
|
│ ││ git checkout feature ▐
|
|
│ ││ git stash pop refs/stash@{0} ▐
|
|
│ ││Checkout commit ▐
|
|
│ ││ git checkout f50c712e23900355c4051a2e91145637fa0dcb9c ▐
|
|
╰───────────────────────────────────1 of 2─╯╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
Apply: <space> | Pop: g | Drop: d | Keybindings: ? Donate Ask Question 0.58.1
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
╭─[1]─Status───────────────────────────────╮╭─[0]─Stash───────────────────────────────────────────────────────────────────────────╮
|
|
│lazygit-keys-test → feature ││stash@{0}: On main: Auto-stashing changes for checking out feature ▐
|
|
╰──────────────────────────────────────────╯│ ▐
|
|
╭─[2]─Files - Worktr(only conflicting)─────╮│ file1.txt | 1 + ▐
|
|
│UU file1.txt ││ file2.txt | 1 + ▐
|
|
│ ││ 2 files changed, 2 insertions(+) ▐
|
|
│ ││ ▐
|
|
│ ││diff --git a/file1.txt b/file1.txt ▐
|
|
│ ││index e79c5e8..40e29ef 100644 ▐
|
|
│ ││--- a/file1.txt ▐
|
|
│ ││+++ b/file1.txt ▐
|
|
│ ││@@ -1 +1,2 @@ ▐
|
|
│ ││ initial ▐
|
|
╰───────────────────────────────────1 of 1─╯│+unstaged change ▐
|
|
╭─[3]─Local branches - Remotes - Tags──────╮│diff --git a/file2.txt b/file2.txt ▐
|
|
│ * feature ││index e79c5e8..e5f18d7 100644 ▐
|
|
│33s main ││--- a/file2.txt ▐
|
|
│ ││+++ b/file2.txt ▐
|
|
│ ││@@ -1 +1,2 @@ ▐
|
|
│ ││ initial ▐
|
|
│ ││+staged change ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ │
|
|
╰───────────────────────────────────1 of 2─╯│ │
|
|
╭─[4]─Commits - Reflog─────────────────────╮│ │
|
|
│f50c712e Te ◯ Feature work ││ │
|
|
│3dafa1cf Te ◯ Initial commit ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
╰───────────────────────────────────1 of 2─╯╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
╭─[5]─Stash────────────────────────────────╮╭─Command log─────────────────────────────────────────────────────────────────────────╮
|
|
│4s On main: Auto-stashing changes for che││ git add -- file1.txt │
|
|
│22s On main: My stash entry ││Checkout branch │
|
|
│ ││ git checkout feature │
|
|
│ ││ git stash push -m "Auto-stashing changes for checking out feature" ▐
|
|
│ ││ git checkout feature ▐
|
|
│ ││ git stash pop refs/stash@{0} ▐
|
|
│ ││Checkout commit ▐
|
|
│ ││ git checkout f50c712e23900355c4051a2e91145637fa0dcb9c ▐
|
|
╰───────────────────────────────────1 of 2─╯╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
Apply: <space> | Pop: g | Drop: d | Keybindings: ? Donate Ask Question 0.58.1
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
╭─[1]─Status───────────────────────────────╮╭─[0]─Stash───────────────────────────────────────────────────────────────────────────╮
|
|
│lazygit-keys-test → feature ││stash@{0}: On main: Auto-stashing changes for checking out feature ▐
|
|
╰──────────────────────────────────────────╯│ ▐
|
|
╭─[2]─Files - Worktr(only conflicting)─────╮│ file1.txt | 1 + ▐
|
|
│UU file1.txt ││ file2.txt | 1 + ▐
|
|
│ ││ 2 files changed, 2 insertions(+) ▐
|
|
│ ││ ▐
|
|
│ ││diff --git a/file1.txt b/file1.txt ▐
|
|
│ ││index e79c5e8..40e29ef 100644 ▐
|
|
│ ││--- a/file1.txt ▐
|
|
│ ││+++ b/file1.txt ▐
|
|
│ ││@@ -1 +1,2 @@ ▐
|
|
│ ││ initial ▐
|
|
╰───────────────────────────────────1 of 1─╯│+unstaged change ▐
|
|
╭─[3]─Local branches - Remotes - Tags──────╮│diff --git a/file2.txt b/file2.txt ▐
|
|
│ * feature ││index e79c5e8..e5f18d7 100644 ▐
|
|
│33s main ││--- a/file2.txt ▐
|
|
│ ││+++ b/file2.txt ▐
|
|
│ ││@@ -1 +1,2 @@ ▐
|
|
│ ││ initial ▐
|
|
│ ││+staged change ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ │
|
|
╰───────────────────────────────────1 of 2─╯│ │
|
|
╭─[4]─Commits - Reflog─────────────────────╮│ │
|
|
│f50c712e Te ◯ Feature work ││ │
|
|
│3dafa1cf Te ◯ Initial commit ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
╰───────────────────────────────────1 of 2─╯╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
╭─[5]─Stash────────────────────────────────╮╭─Command log─────────────────────────────────────────────────────────────────────────╮
|
|
│4s On main: Auto-stashing changes for che││ git add -- file1.txt │
|
|
│22s On main: My stash entry ││Checkout branch │
|
|
│ ││ git checkout feature │
|
|
│ ││ git stash push -m "Auto-stashing changes for checking out feature" ▐
|
|
│ ││ git checkout feature ▐
|
|
│ ││ git stash pop refs/stash@{0} ▐
|
|
│ ││Checkout commit ▐
|
|
│ ││ git checkout f50c712e23900355c4051a2e91145637fa0dcb9c ▐
|
|
╰───────────────────────────────────1 of 2─╯╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
Apply: <space> | Pop: g | Drop: d | Keybindings: ? Donate Ask Question 0.58.1
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
╭─[1]─Status───────────────────────────────╮╭─[0]─Stash───────────────────────────────────────────────────────────────────────────╮
|
|
│lazygit-keys-test → feature ││stash@{0}: On main: Auto-stashing changes for checking out feature ▐
|
|
╰──────────────────────────────────────────╯│ ▐
|
|
╭─[2]─Files - Worktr(only conflicting)─────╮│ file1.txt | 1 + ▐
|
|
│UU file1.txt ││ file2.txt | 1 + ▐
|
|
│ ││ 2 files changed, 2 insertions(+) ▐
|
|
│ ││ ▐
|
|
│ ││diff --git a/file1.txt b/file1.txt ▐
|
|
│ ││index e79c5e8..40e29ef 100644 ▐
|
|
│ ││--- a/file1.txt ▐
|
|
│ ││+++ b/file1.txt ▐
|
|
│ ││@@ -1 +1,2 @@ ▐
|
|
│ ││ initial ▐
|
|
╰───────────────────────────────────1 of 1─╯│+unstaged change ▐
|
|
╭─[3]─Local branches - Remotes - Tags──────╮│diff --git a/file2.txt b/file2.txt ▐
|
|
│ * feature ││index e79c5e8..e5f18d7 100644 ▐
|
|
│33s main ││--- a/file2.txt ▐
|
|
│ ││+++ b/file2.txt ▐
|
|
│ ││@@ -1 +1,2 @@ ▐
|
|
│ ││ initial ▐
|
|
│ ││+staged change ▐
|
|
│ ╭─Stash apply───────────────────────────────────────────────────────────────────╮ ▐
|
|
│ │Are you sure you want to apply this stash entry? │ ▐
|
|
│ ╰───────────────────────────────────────────────────────────────────────────────╯ │
|
|
╰───────────────────────────────────1 of 2─╯│ │
|
|
╭─[4]─Commits - Reflog─────────────────────╮│ │
|
|
│f50c712e Te ◯ Feature work ││ │
|
|
│3dafa1cf Te ◯ Initial commit ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
╰───────────────────────────────────1 of 2─╯╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
╭─[5]─Stash────────────────────────────────╮╭─Command log─────────────────────────────────────────────────────────────────────────╮
|
|
│4s On main: Auto-stashing changes for che││ git add -- file1.txt │
|
|
│22s On main: My stash entry ││Checkout branch │
|
|
│ ││ git checkout feature │
|
|
│ ││ git stash push -m "Auto-stashing changes for checking out feature" ▐
|
|
│ ││ git checkout feature ▐
|
|
│ ││ git stash pop refs/stash@{0} ▐
|
|
│ ││Checkout commit ▐
|
|
│ ││ git checkout f50c712e23900355c4051a2e91145637fa0dcb9c ▐
|
|
╰───────────────────────────────────1 of 2─╯╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
Confirm: <enter> | Close/Cancel: <esc> | Copy to clipboard: <c-o> Donate Ask Question 0.58.1
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
╭─[1]─Status───────────────────────────────╮╭─[0]─Stash───────────────────────────────────────────────────────────────────────────╮
|
|
│lazygit-keys-test → feature ││stash@{0}: On main: Auto-stashing changes for checking out feature ▐
|
|
╰──────────────────────────────────────────╯│ ▐
|
|
╭─[2]─Files - Worktr(only conflicting)─────╮│ file1.txt | 1 + ▐
|
|
│UU file1.txt ││ file2.txt | 1 + ▐
|
|
│ ││ 2 files changed, 2 insertions(+) ▐
|
|
│ ││ ▐
|
|
│ ││diff --git a/file1.txt b/file1.txt ▐
|
|
│ ││index e79c5e8..40e29ef 100644 ▐
|
|
│ ││--- a/file1.txt ▐
|
|
│ ││+++ b/file1.txt ▐
|
|
│ ││@@ -1 +1,2 @@ ▐
|
|
│ ││ initial ▐
|
|
╰───────────────────────────────────1 of 1─╯│+unstaged change ▐
|
|
╭─[3]─Local branches - Remotes - Tags──────╮│diff --git a/file2.txt b/file2.txt ▐
|
|
│ * feature ││index e79c5e8..e5f18d7 100644 ▐
|
|
│33s main ││--- a/file2.txt ▐
|
|
│ ││+++ b/file2.txt ▐
|
|
│ ││@@ -1 +1,2 @@ ▐
|
|
│ ││ initial ▐
|
|
│ ││+staged change ▐
|
|
│ ╭─Stash apply───────────────────────────────────────────────────────────────────╮ ▐
|
|
│ │Are you sure you want to apply this stash entry? │ ▐
|
|
│ ╰───────────────────────────────────────────────────────────────────────────────╯ │
|
|
╰───────────────────────────────────1 of 2─╯│ │
|
|
╭─[4]─Commits - Reflog─────────────────────╮│ │
|
|
│f50c712e Te ◯ Feature work ││ │
|
|
│3dafa1cf Te ◯ Initial commit ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
╰───────────────────────────────────1 of 2─╯╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
╭─[5]─Stash────────────────────────────────╮╭─Command log─────────────────────────────────────────────────────────────────────────╮
|
|
│4s On main: Auto-stashing changes for che││ git add -- file1.txt │
|
|
│22s On main: My stash entry ││Checkout branch │
|
|
│ ││ git checkout feature │
|
|
│ ││ git stash push -m "Auto-stashing changes for checking out feature" ▐
|
|
│ ││ git checkout feature ▐
|
|
│ ││ git stash pop refs/stash@{0} ▐
|
|
│ ││Checkout commit ▐
|
|
│ ││ git checkout f50c712e23900355c4051a2e91145637fa0dcb9c ▐
|
|
╰───────────────────────────────────1 of 2─╯╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
Confirm: <enter> | Close/Cancel: <esc> | Copy to clipboard: <c-o> Donate Ask Question 0.58.1
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
╭─[1]─Status───────────────────────────────╮╭─[0]─Stash───────────────────────────────────────────────────────────────────────────╮
|
|
│lazygit-keys-test → feature ││stash@{0}: On main: Auto-stashing changes for checking out feature ▐
|
|
╰──────────────────────────────────────────╯│ ▐
|
|
╭─[2]─Files - Worktr(only conflicting)─────╮│ file1.txt | 1 + ▐
|
|
│UU file1.txt ││ file2.txt | 1 + ▐
|
|
│ ││ 2 files changed, 2 insertions(+) ▐
|
|
│ ││ ▐
|
|
│ ││diff --git a/file1.txt b/file1.txt ▐
|
|
│ ││index e79c5e8..40e29ef 100644 ▐
|
|
│ ││--- a/file1.txt ▐
|
|
│ ││+++ b/file1.txt ▐
|
|
│ ││@@ -1 +1,2 @@ ▐
|
|
│ ││ initial ▐
|
|
╰───────────────────────────────────1 of 1─╯│+unstaged change ▐
|
|
╭─[3]─Local branches - Remotes - Tags──────╮│diff --git a/file2.txt b/file2.txt ▐
|
|
│ * feature ││index e79c5e8..e5f18d7 100644 ▐
|
|
│33s main ││--- a/file2.txt ▐
|
|
│ ││+++ b/file2.txt ▐
|
|
│ ││@@ -1 +1,2 @@ ▐
|
|
│ ││ initial ▐
|
|
│ ││+staged change ▐
|
|
│ ╭─Stash apply───────────────────────────────────────────────────────────────────╮ ▐
|
|
│ │Are you sure you want to apply this stash entry? │ ▐
|
|
│ ╰───────────────────────────────────────────────────────────────────────────────╯ │
|
|
╰───────────────────────────────────1 of 2─╯│ │
|
|
╭─[4]─Commits - Reflog─────────────────────╮│ │
|
|
│f50c712e Te ◯ Feature work ││ │
|
|
│3dafa1cf Te ◯ Initial commit ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
╰───────────────────────────────────1 of 2─╯╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
╭─[5]─Stash────────────────────────────────╮╭─Command log─────────────────────────────────────────────────────────────────────────╮
|
|
│4s On main: Auto-stashing changes for che││ git add -- file1.txt │
|
|
│22s On main: My stash entry ││Checkout branch │
|
|
│ ││ git checkout feature │
|
|
│ ││ git stash push -m "Auto-stashing changes for checking out feature" ▐
|
|
│ ││ git checkout feature ▐
|
|
│ ││ git stash pop refs/stash@{0} ▐
|
|
│ ││Checkout commit ▐
|
|
│ ││ git checkout f50c712e23900355c4051a2e91145637fa0dcb9c ▐
|
|
╰───────────────────────────────────1 of 2─╯╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
Confirm: <enter> | Close/Cancel: <esc> | Copy to clipboard: <c-o> Donate Ask Question 0.58.1
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
╭─[1]─Status───────────────────────────────╮╭─[0]─Stash───────────────────────────────────────────────────────────────────────────╮
|
|
│lazygit-keys-test → feature ││stash@{0}: On main: Auto-stashing changes for checking out feature ▐
|
|
╰──────────────────────────────────────────╯│ ▐
|
|
╭─[2]─Files - Worktr(only conflicting)─────╮│ file1.txt | 1 + ▐
|
|
│UU file1.txt ││ file2.txt | 1 + ▐
|
|
│ ││ 2 files changed, 2 insertions(+) ▐
|
|
│ ││ ▐
|
|
│ ││diff --git a/file1.txt b/file1.txt ▐
|
|
│ ││index e79c5e8..40e29ef 100644 ▐
|
|
│ ││--- a/file1.txt ▐
|
|
│ ││+++ b/file1.txt ▐
|
|
│ ││@@ -1 +1,2 @@ ▐
|
|
│ ││ initial ▐
|
|
╰───────────────────────────────────1 of 1─╯│+unstaged change ▐
|
|
╭─[3]─Local branches - Remotes - Tags──────╮│diff --git a/file2.txt b/file2.txt ▐
|
|
│ * feature ││index e79c5e8..e5f18d7 100644 ▐
|
|
│37s main ││--- a/file2.txt ▐
|
|
│ ││+++ b/file2.txt ▐
|
|
│ ││@@ -1 +1,2 @@ ▐
|
|
│ ││ initial ▐
|
|
│ ││+staged change ▐
|
|
│ ╭─Error─────────────────────────────────────────────────────────────────────────╮ ▐
|
|
│ │file1.txt: needs merge │ ▐
|
|
│ ╰───────────────────────────────────────────────────────────────────────────────╯ │
|
|
╰───────────────────────────────────1 of 2─╯│ │
|
|
╭─[4]─Commits - Reflog─────────────────────╮│ │
|
|
│f50c712e Te ◯ Feature work ││ │
|
|
│3dafa1cf Te ◯ Initial commit ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
╰───────────────────────────────────1 of 2─╯╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
╭─[5]─Stash────────────────────────────────╮╭─Command log─────────────────────────────────────────────────────────────────────────╮
|
|
│8s On main: Auto-stashing changes for che││ git checkout feature │
|
|
│26s On main: My stash entry ││ git stash push -m "Auto-stashing changes for checking out feature" │
|
|
│ ││ git checkout feature │
|
|
│ ││ git stash pop refs/stash@{0} ▐
|
|
│ ││Checkout commit ▐
|
|
│ ││ git checkout f50c712e23900355c4051a2e91145637fa0dcb9c ▐
|
|
│ ││Apply stash ▐
|
|
│ ││ git stash apply refs/stash@{0} ▐
|
|
╰───────────────────────────────────1 of 2─╯╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
Confirm: <enter> | Close/Cancel: <esc> | Copy to clipboard: <c-o> Donate Ask Question 0.58.1
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
╭─[1]─Status───────────────────────────────╮╭─[0]─Stash───────────────────────────────────────────────────────────────────────────╮
|
|
│lazygit-keys-test → feature ││stash@{0}: On main: Auto-stashing changes for checking out feature ▐
|
|
╰──────────────────────────────────────────╯│ ▐
|
|
╭─[2]─Files - Worktr(only conflicting)─────╮│ file1.txt | 1 + ▐
|
|
│UU file1.txt ││ file2.txt | 1 + ▐
|
|
│ ││ 2 files changed, 2 insertions(+) ▐
|
|
│ ││ ▐
|
|
│ ││diff --git a/file1.txt b/file1.txt ▐
|
|
│ ││index e79c5e8..40e29ef 100644 ▐
|
|
│ ││--- a/file1.txt ▐
|
|
│ ││+++ b/file1.txt ▐
|
|
│ ││@@ -1 +1,2 @@ ▐
|
|
│ ││ initial ▐
|
|
╰───────────────────────────────────1 of 1─╯│+unstaged change ▐
|
|
╭─[3]─Local branches - Remotes - Tags──────╮│diff --git a/file2.txt b/file2.txt ▐
|
|
│ * feature ││index e79c5e8..e5f18d7 100644 ▐
|
|
│37s main ││--- a/file2.txt ▐
|
|
│ ││+++ b/file2.txt ▐
|
|
│ ││@@ -1 +1,2 @@ ▐
|
|
│ ││ initial ▐
|
|
│ ││+staged change ▐
|
|
│ ╭─Error─────────────────────────────────────────────────────────────────────────╮ ▐
|
|
│ │file1.txt: needs merge │ ▐
|
|
│ ╰───────────────────────────────────────────────────────────────────────────────╯ │
|
|
╰───────────────────────────────────1 of 2─╯│ │
|
|
╭─[4]─Commits - Reflog─────────────────────╮│ │
|
|
│f50c712e Te ◯ Feature work ││ │
|
|
│3dafa1cf Te ◯ Initial commit ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
╰───────────────────────────────────1 of 2─╯╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
╭─[5]─Stash────────────────────────────────╮╭─Command log─────────────────────────────────────────────────────────────────────────╮
|
|
│8s On main: Auto-stashing changes for che││ git checkout feature │
|
|
│26s On main: My stash entry ││ git stash push -m "Auto-stashing changes for checking out feature" │
|
|
│ ││ git checkout feature │
|
|
│ ││ git stash pop refs/stash@{0} ▐
|
|
│ ││Checkout commit ▐
|
|
│ ││ git checkout f50c712e23900355c4051a2e91145637fa0dcb9c ▐
|
|
│ ││Apply stash ▐
|
|
│ ││ git stash apply refs/stash@{0} ▐
|
|
╰───────────────────────────────────1 of 2─╯╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
Confirm: <enter> | Close/Cancel: <esc> | Copy to clipboard: <c-o> Donate Ask Question 0.58.1
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
╭─[1]─Status───────────────────────────────╮╭─[0]─Stash───────────────────────────────────────────────────────────────────────────╮
|
|
│lazygit-keys-test → feature ││stash@{0}: On main: Auto-stashing changes for checking out feature ▐
|
|
╰──────────────────────────────────────────╯│ ▐
|
|
╭─[2]─Files - Worktr(only conflicting)─────╮│ file1.txt | 1 + ▐
|
|
│UU file1.txt ││ file2.txt | 1 + ▐
|
|
│ ││ 2 files changed, 2 insertions(+) ▐
|
|
│ ││ ▐
|
|
│ ││diff --git a/file1.txt b/file1.txt ▐
|
|
│ ││index e79c5e8..40e29ef 100644 ▐
|
|
│ ││--- a/file1.txt ▐
|
|
│ ││+++ b/file1.txt ▐
|
|
│ ││@@ -1 +1,2 @@ ▐
|
|
│ ││ initial ▐
|
|
╰───────────────────────────────────1 of 1─╯│+unstaged change ▐
|
|
╭─[3]─Local branches - Remotes - Tags──────╮│diff --git a/file2.txt b/file2.txt ▐
|
|
│ * feature ││index e79c5e8..e5f18d7 100644 ▐
|
|
│37s main ││--- a/file2.txt ▐
|
|
│ ││+++ b/file2.txt ▐
|
|
│ ││@@ -1 +1,2 @@ ▐
|
|
│ ││ initial ▐
|
|
│ ││+staged change ▐
|
|
│ ╭─Error─────────────────────────────────────────────────────────────────────────╮ ▐
|
|
│ │file1.txt: needs merge │ ▐
|
|
│ ╰───────────────────────────────────────────────────────────────────────────────╯ │
|
|
╰───────────────────────────────────1 of 2─╯│ │
|
|
╭─[4]─Commits - Reflog─────────────────────╮│ │
|
|
│f50c712e Te ◯ Feature work ││ │
|
|
│3dafa1cf Te ◯ Initial commit ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
╰───────────────────────────────────1 of 2─╯╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
╭─[5]─Stash────────────────────────────────╮╭─Command log─────────────────────────────────────────────────────────────────────────╮
|
|
│8s On main: Auto-stashing changes for che││ git checkout feature │
|
|
│26s On main: My stash entry ││ git stash push -m "Auto-stashing changes for checking out feature" │
|
|
│ ││ git checkout feature │
|
|
│ ││ git stash pop refs/stash@{0} ▐
|
|
│ ││Checkout commit ▐
|
|
│ ││ git checkout f50c712e23900355c4051a2e91145637fa0dcb9c ▐
|
|
│ ││Apply stash ▐
|
|
│ ││ git stash apply refs/stash@{0} ▐
|
|
╰───────────────────────────────────1 of 2─╯╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
Confirm: <enter> | Close/Cancel: <esc> | Copy to clipboard: <c-o> Donate Ask Question 0.58.1
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
╭─[1]─Status───────────────────────────────╮╭─[0]─Stash───────────────────────────────────────────────────────────────────────────╮
|
|
│lazygit-keys-test → feature ││stash@{0}: On main: Auto-stashing changes for checking out feature ▐
|
|
╰──────────────────────────────────────────╯│ ▐
|
|
╭─[2]─Files - Worktr(only conflicting)─────╮│ file1.txt | 1 + ▐
|
|
│UU file1.txt ││ file2.txt | 1 + ▐
|
|
│ ││ 2 files changed, 2 insertions(+) ▐
|
|
│ ││ ▐
|
|
│ ││diff --git a/file1.txt b/file1.txt ▐
|
|
│ ││index e79c5e8..40e29ef 100644 ▐
|
|
│ ││--- a/file1.txt ▐
|
|
│ ││+++ b/file1.txt ▐
|
|
│ ││@@ -1 +1,2 @@ ▐
|
|
│ ││ initial ▐
|
|
╰───────────────────────────────────1 of 1─╯│+unstaged change ▐
|
|
╭─[3]─Local branches - Remotes - Tags──────╮│diff --git a/file2.txt b/file2.txt ▐
|
|
│ * feature ││index e79c5e8..e5f18d7 100644 ▐
|
|
│37s main ││--- a/file2.txt ▐
|
|
│ ││+++ b/file2.txt ▐
|
|
│ ││@@ -1 +1,2 @@ ▐
|
|
│ ││ initial ▐
|
|
│ ││+staged change ▐
|
|
│ ╭─Error─────────────────────────────────────────────────────────────────────────╮ ▐
|
|
│ │file1.txt: needs merge │ ▐
|
|
│ ╰───────────────────────────────────────────────────────────────────────────────╯ │
|
|
╰───────────────────────────────────1 of 2─╯│ │
|
|
╭─[4]─Commits - Reflog─────────────────────╮│ │
|
|
│f50c712e Te ◯ Feature work ││ │
|
|
│3dafa1cf Te ◯ Initial commit ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
╰───────────────────────────────────1 of 2─╯╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
╭─[5]─Stash────────────────────────────────╮╭─Command log─────────────────────────────────────────────────────────────────────────╮
|
|
│8s On main: Auto-stashing changes for che││ git checkout feature │
|
|
│26s On main: My stash entry ││ git stash push -m "Auto-stashing changes for checking out feature" │
|
|
│ ││ git checkout feature │
|
|
│ ││ git stash pop refs/stash@{0} ▐
|
|
│ ││Checkout commit ▐
|
|
│ ││ git checkout f50c712e23900355c4051a2e91145637fa0dcb9c ▐
|
|
│ ││Apply stash ▐
|
|
│ ││ git stash apply refs/stash@{0} ▐
|
|
╰───────────────────────────────────1 of 2─╯╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
Confirm: <enter> | Close/Cancel: <esc> | Copy to clipboard: <c-o> Donate Ask Question 0.58.1
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
╭─[1]─Status───────────────────────────────╮╭─[0]─Stash───────────────────────────────────────────────────────────────────────────╮
|
|
│lazygit-keys-test → feature ││stash@{0}: On main: Auto-stashing changes for checking out feature ▐
|
|
╰──────────────────────────────────────────╯│ ▐
|
|
╭─[2]─Files - Worktr(only conflicting)─────╮│ file1.txt | 1 + ▐
|
|
│UU file1.txt ││ file2.txt | 1 + ▐
|
|
│ ││ 2 files changed, 2 insertions(+) ▐
|
|
│ ││ ▐
|
|
│ ││diff --git a/file1.txt b/file1.txt ▐
|
|
│ ││index e79c5e8..40e29ef 100644 ▐
|
|
│ ││--- a/file1.txt ▐
|
|
│ ││+++ b/file1.txt ▐
|
|
│ ││@@ -1 +1,2 @@ ▐
|
|
│ ││ initial ▐
|
|
╰───────────────────────────────────1 of 1─╯│+unstaged change ▐
|
|
╭─[3]─Local branches - Remotes - Tags──────╮│diff --git a/file2.txt b/file2.txt ▐
|
|
│ * feature ││index e79c5e8..e5f18d7 100644 ▐
|
|
│37s main ││--- a/file2.txt ▐
|
|
│ ││+++ b/file2.txt ▐
|
|
│ ││@@ -1 +1,2 @@ ▐
|
|
│ ││ initial ▐
|
|
│ ││+staged change ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ │
|
|
╰───────────────────────────────────1 of 2─╯│ │
|
|
╭─[4]─Commits - Reflog─────────────────────╮│ │
|
|
│f50c712e Te ◯ Feature work ││ │
|
|
│3dafa1cf Te ◯ Initial commit ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
╰───────────────────────────────────1 of 2─╯╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
╭─[5]─Stash────────────────────────────────╮╭─Command log─────────────────────────────────────────────────────────────────────────╮
|
|
│8s On main: Auto-stashing changes for che││ git checkout feature │
|
|
│26s On main: My stash entry ││ git stash push -m "Auto-stashing changes for checking out feature" │
|
|
│ ││ git checkout feature │
|
|
│ ││ git stash pop refs/stash@{0} ▐
|
|
│ ││Checkout commit ▐
|
|
│ ││ git checkout f50c712e23900355c4051a2e91145637fa0dcb9c ▐
|
|
│ ││Apply stash ▐
|
|
│ ││ git stash apply refs/stash@{0} ▐
|
|
╰───────────────────────────────────1 of 2─╯╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
Apply: <space> | Pop: g | Drop: d | Keybindings: ? Donate Ask Question 0.58.1
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
╭─[1]─Status───────────────────────────────╮╭─[0]─Stash───────────────────────────────────────────────────────────────────────────╮
|
|
│lazygit-keys-test → feature ││stash@{0}: On main: Auto-stashing changes for checking out feature ▐
|
|
╰──────────────────────────────────────────╯│ ▐
|
|
╭─[2]─Files - Worktr(only conflicting)─────╮│ file1.txt | 1 + ▐
|
|
│UU file1.txt ││ file2.txt | 1 + ▐
|
|
│ ││ 2 files changed, 2 insertions(+) ▐
|
|
│ ││ ▐
|
|
│ ││diff --git a/file1.txt b/file1.txt ▐
|
|
│ ││index e79c5e8..40e29ef 100644 ▐
|
|
│ ││--- a/file1.txt ▐
|
|
│ ││+++ b/file1.txt ▐
|
|
│ ││@@ -1 +1,2 @@ ▐
|
|
│ ││ initial ▐
|
|
╰───────────────────────────────────1 of 1─╯│+unstaged change ▐
|
|
╭─[3]─Local branches - Remotes - Tags──────╮│diff --git a/file2.txt b/file2.txt ▐
|
|
│ * feature ││index e79c5e8..e5f18d7 100644 ▐
|
|
│37s main ││--- a/file2.txt ▐
|
|
│ ││+++ b/file2.txt ▐
|
|
│ ││@@ -1 +1,2 @@ ▐
|
|
│ ││ initial ▐
|
|
│ ││+staged change ▐
|
|
│ ││ ▐
|
|
│ ││ ▐
|
|
│ ││ │
|
|
╰───────────────────────────────────1 of 2─╯│ │
|
|
╭─[4]─Commits - Reflog─────────────────────╮│ │
|
|
│f50c712e Te ◯ Feature work ││ │
|
|
│3dafa1cf Te ◯ Initial commit ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
│ ││ │
|
|
╰───────────────────────────────────1 of 2─╯╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
╭─[5]─Stash────────────────────────────────╮╭─Command log─────────────────────────────────────────────────────────────────────────╮
|
|
│8s On main: Auto-stashing changes for che││ git checkout feature │
|
|
│26s On main: My stash entry ││ git stash push -m "Auto-stashing changes for checking out feature" │
|
|
│ ││ git checkout feature │
|
|
│ ││ git stash pop refs/stash@{0} ▐
|
|
│ ││Checkout commit ▐
|
|
│ ││ git checkout f50c712e23900355c4051a2e91145637fa0dcb9c ▐
|
|
│ ││Apply stash ▐
|
|
│ ││ git stash apply refs/stash@{0} ▐
|
|
╰───────────────────────────────────1 of 2─╯╰─────────────────────────────────────────────────────────────────────────────────────╯
|
|
Apply: <space> | Pop: g | Drop: d | Keybindings: ? Donate Ask Question 0.58.1
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
> rm -rf /tmp/lazygit-keys-test && mkdir -p /tmp/lazygit-keys-test && cd /tmp/lazygit-keys-test
|
|
> git init -b main && git config user.email 'test@test.com' && git config user.name 'Test'
|
|
Initialized empty Git repository in /tmp/lazygit-keys-test/.git/
|
|
> echo 'initial' > file1.txt && echo 'initial' > file2.txt && git add . && git commit -m 'Initial commit'
|
|
[main (root-commit) 3dafa1c] Initial commit
|
|
2 files changed, 2 insertions(+)
|
|
create mode 100644 file1.txt
|
|
create mode 100644 file2.txt
|
|
> git checkout -b feature && echo 'feature' >> file1.txt && git add . && git commit -m 'Feature work' && git checkout main
|
|
Switched to a new branch 'feature'
|
|
[feature f50c712] Feature work
|
|
1 file changed, 1 insertion(+)
|
|
Switched to branch 'main'
|
|
> echo 'stash me' >> file1.txt && git stash push -m 'My stash entry'
|
|
Saved working directory and index state On main: My stash entry
|
|
> echo 'unstaged change' >> file1.txt && echo 'staged change' >> file2.txt && git add file2.txt
|
|
> lazygit
|
|
>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
> rm -rf /tmp/lazygit-keys-test && mkdir -p /tmp/lazygit-keys-test && cd /tmp/lazygit-keys-test
|
|
> git init -b main && git config user.email 'test@test.com' && git config user.name 'Test'
|
|
Initialized empty Git repository in /tmp/lazygit-keys-test/.git/
|
|
> echo 'initial' > file1.txt && echo 'initial' > file2.txt && git add . && git commit -m 'Initial commit'
|
|
[main (root-commit) 3dafa1c] Initial commit
|
|
2 files changed, 2 insertions(+)
|
|
create mode 100644 file1.txt
|
|
create mode 100644 file2.txt
|
|
> git checkout -b feature && echo 'feature' >> file1.txt && git add . && git commit -m 'Feature work' && git checkout main
|
|
Switched to a new branch 'feature'
|
|
[feature f50c712] Feature work
|
|
1 file changed, 1 insertion(+)
|
|
Switched to branch 'main'
|
|
> echo 'stash me' >> file1.txt && git stash push -m 'My stash entry'
|
|
Saved working directory and index state On main: My stash entry
|
|
> echo 'unstaged change' >> file1.txt && echo 'staged change' >> file2.txt && git add file2.txt
|
|
> lazygit
|
|
>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
────────────────────────────────────────────────────────────────────────────────
|