Skip to content

Commit bd0d04f

Browse files
committed
README To-do item: Local commit branch behind its remote tracking branch
The problem that inspired this was: git fetch # origin/gh-pages is now ahead of local repo's gh-pages git-commit-filetree gh-pages _site/ # gh-pages has forked because the parent of the commit we # just made is not the latest commit on gh-pages from the # source repo The current workaround is to manually check out and update (fast-forward) the local branch before going back to do our release, which kinda kills the key feature we provide of not having to switch one's working copy back and forth between branches.
1 parent 2aaa89f commit bd0d04f

1 file changed

Lines changed: 3 additions & 0 deletions

File tree

‎README.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@ Missing Features
4141
The following features are still missing from this version of the
4242
program.
4343

44+
* Deal with cases when the local branch to which we're committing is
45+
behind its remote tracking branch. Normally we'd want the local branch
46+
to be fast-forwarded to match the remote before doing our commit.
4447
* Update the reflog after doing the commit.
4548
* Add the ability to specify a commit message.
4649
(This should allow a token to substitute the current HEAD commit at

0 commit comments

Comments
 (0)