Commits

Author Commit Message Labels Comments Date
Junio C Hamano
Merge branch 'js/merge-edit-option'
jacknagel
Documentation: fix formatting error in merge-options.txt
Junio C Hamano
Git 1.7.8
Tags
v1.7.8
Andrew Wong
rebase -i: interrupt rebase when "commit --amend" failed during "reword"
Johan Herland
fast-import: Fix incorrect fanout level when modifying existing notes refs
Johan Herland
t9301: Add 2nd testcase exposing bugs in fast-import's notes fanout handling
Johan Herland
t9301: Fix testcase covering up a bug in fast-import's notes fanout handling
Junio C Hamano
Git 1.7.8-rc4
Tags
v1.7.8-rc4
Jonathan Nieder
Allow checkout -B <current-branch> to update the current branch
Jonathan Nieder
branch: allow a no-op "branch -M <current-branch> HEAD"
Carlos Martín Nieto
convert: track state in LF-to-CRLF filter
Nguyễn Thái Ngọc Duy
checkout,merge: loosen overwriting untracked file check based on info/exclude
Junio C Hamano
Merge branch 'maint' into tj/imap-send-remove-unused
Thomas Jarosch
imap-send: Remove unused 'use_namespace' variable
Vincent van Ravesteijn
builtin-reset: Documentation update
Vincent van Ravesteijn
builtin-branch: Fix crash on invalid use of --force
Jonathan Nieder
revert --abort: do not leave behind useless sequencer-old directory
Johannes Sixt
Fix revert --abort on Windows
Nguyễn Thái Ngọc Duy
revert: do not pass non-literal string as format to git_path()
Junio C Hamano
Update 1.7.8 draft release notes in preparation for rc4
Junio C Hamano
Merge branch 'jn/revert-quit'
Jonathan Nieder
revert: remove --reset compatibility option
Jonathan Nieder
revert: introduce --abort to cancel a failed cherry-pick
Jonathan Nieder
revert: write REVERT_HEAD pseudoref during conflicted revert
Jonathan Nieder
revert: improve error message for cherry-pick during cherry-pick
Jonathan Nieder
revert: rearrange pick_revisions() for clarity
Jonathan Nieder
revert: rename --reset option to --quit
Junio C Hamano
Merge branch 'jk/maint-1.6.2-upload-archive' into jk/maint-upload-archive
Jeff King
archive: don't let remote clients get unreachable commits
Junio C Hamano
Merge branch 'maint'
  1. Prev
  2. Next