Git on Junian Dev

How to Create an Empty Orphan Git Branch

author@junian.dev (Junian Triajianto) — Fri, 06 Feb 2026 19:00:00 +0700

Have you ever wanted to create a new, separate Git branch that doesn’t have any starting point from an existing branch?

One common use case is from the early days of GitHub, when you needed to create a separate empty branch called gh-pages. This branch was orphaned, meaning it had no relationship to the master or main branch, and was used to publish documentation sites to GitHub Pages.

This approach makes sense because you don’t want to upload your application source code from the main branch to GitHub Pages—only the static assets such as HTML, CSS, JavaScript, and other resources required for a static site.

How to Fix Git Refusing to Merge Unrelated Histories Issue

author@junian.dev (Junian Triajianto) — Thu, 25 Sep 2025 03:00:21 +0700

When I tried to merge a git branch from a different repository, I got the following error:

% git merge development-branch
fatal: refusing to merge unrelated histories

Git is refusing to merge the branch because the histories do not share a common ancestor.

The error message fatal: refusing to merge unrelated histories means that the two branches have completely separate histories.

How to Set the Default GitHub Branch to 'master'

author@junian.dev (Junian Triajianto) — Tue, 09 Sep 2025 12:27:54 +0700

Consider this scenario where you create a new Git repository using the command-line tool.

$ mkdir new-repo
$ cd new-repo
$ git init
Initialized empty Git repository in /Users/junian/new-repo/.git/
$ touch README.md
$ git add .
$ git commit -m "Init"
[master (root-commit) d088569] Init
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 README.md
$ git status
On branch master
nothing to commit, working tree clean

As you can see, the git CLI still defaults to the master branch. I respect that and am fine with it.

Git Pull 'Rebase in Progress' Issue

author@junian.dev (Junian Triajianto) — Mon, 10 Mar 2025 10:00:13 +0700

When I tried to pull a Git repository with SourceTree, I encountered the following error:

Rebase In Progress

It appears that you have a rebase in progress that was probably interrupted because of a conflict. If you’ve resolved the conflicts in your working copy, please choose whether to continue the rebase or abort this process where you are now.

Git Pull ‘Rebase In Progress’ issue

I didn’t remember whether I had been doing a Git rebase before. But well, let’s try to fix it in the Terminal.

Automating Git Cleanup Across Multiple Directories with a Shell Script

author@junian.dev (Junian Triajianto) — Tue, 17 Dec 2024 15:42:26 +0700

Managing multiple Git repositories can be a tedious task. One task I often perform is ensuring each repository is clean and reset to its original state. Instead of manually navigating into each directory and running Git commands, I like to automate the process with a simple shell script.

Objective of the Script

This script automates two key tasks for all Git repositories in the current working directory:

git clean -fdx: Removes untracked files, directories, and ignored files.
git reset --hard HEAD: Resets the repository to the last commit, discarding all local changes.

The script loops through each directory, checks if it’s a Git repository, and then performs the cleanup operations.

Text-Based Password Manager

author@junian.dev (Junian Triajianto) — Tue, 16 Apr 2019 10:57:29 +0700

Everyone needs a password manager. I have dozens of credentials to several websites. Re-using password across websites is no. Memorizing dozens of different password is also a no. The only way is to use a password manager.

For so long, I’ve been searching for the simplest possible password manager. I only need two criteria: plaintext and git-friendly.

Why Plaintext?

Yeah, you heard that right, it has to be plaintext. But that doesn’t mean it has to be stored as real plain text, where everyone or every machine can read it. That would be so wrong. What I mean is it has to be stored as simple text files, not binary. If you ever see the content of your public and private ssh keys, that’s what I mean.

How to Create a Local Git Server

author@junian.dev (Junian Triajianto) — Mon, 15 Apr 2019 13:17:17 +0700

In this tutorial, I’ll show you how to create a git server in your local network.

You might be thinking why would I? Usually, when we’re working git repository, we go to online services like GitHub. We create a private project for privacy. But that’s not enough for all cases.

You maybe need a git repository to store password. Putting it in a cloud service is not cool.

There is a very simple way to set up your own git server.