Merge branch 'js/apply-build-ancestor'
Junio C Hamano committed about 19 years ago
git-gui: Deiconify startup wizard so it raises to the top
Johannes Schindelin committed about 19 years ago
git-merge: add --ff and --no-ff options
Lars Hjemli committed about 19 years ago
git-merge: add support for --commit and --no-squash
Lars Hjemli committed about 19 years ago
git-merge: add support for branch.<name>.mergeoptions
Lars Hjemli committed about 19 years ago
git-merge: refactor option parsing
Lars Hjemli committed about 19 years ago
git-merge: fix faulty SQUASH_MSG
Lars Hjemli committed about 19 years ago
Add test-script for git-merge porcelain
Lars Hjemli committed about 19 years ago
Junio C Hamano committed about 19 years ago
Merge branch 'maint' of git://linux-nfs.org/~bfields/git into maint
Junio C Hamano committed about 19 years ago
git-svn: don't attempt to spawn pager if we don't want one
Eric Wong committed about 19 years ago
Supplant the "while case ... break ;; esac" idiom
David Kastrup committed about 19 years ago
User Manual: add a chapter for submodules
Miklos Vajna committed about 19 years ago
user-manual: don't assume refs are stored under .git/refs
J. Bruce Fields committed about 19 years ago
git-gui: Avoid console scrollbars unless they are necessary
Shawn O. Pearce committed about 19 years ago
git-gui: Allow users to choose/create/clone a repository
Shawn O. Pearce committed about 19 years ago
Detect exec bit in more cases.
David Brown committed about 19 years ago
git-gui: Refactor some UI init to occur earlier
Shawn O. Pearce committed about 19 years ago
gitk: Simplify highlighting interface and combine with Find function
Paul Mackerras committed about 19 years ago
Shawn O. Pearce committed about 19 years ago