diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2007-09-23 17:13:55 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-09-23 17:13:55 -0700 |
| commit | 4f337e24662f07513fd6e8388f27f13dbe44cadc (patch) | |
| tree | 8ad206ef3ff7aa7117a5c9120bbd45345ff7ae3a /git-merge-stupid.sh | |
| parent | rev-list --bisect: Fix best == NULL case. (diff) | |
| parent | Merge branch 'maint' of git://linux-nfs.org/~bfields/git into maint (diff) | |
| download | tgif-4f337e24662f07513fd6e8388f27f13dbe44cadc.tar.xz | |
Merge branch 'maint'
* maint:
git-svn: don't attempt to spawn pager if we don't want one
Supplant the "while case ... break ;; esac" idiom
User Manual: add a chapter for submodules
user-manual: don't assume refs are stored under .git/refs
Detect exec bit in more cases.
Conjugate "search" correctly in the git-prune-packed man page.
Move the paragraph specifying where the .idx and .pack files should be
Documentation/git-lost-found.txt: drop unnecessarily duplicated name.
Diffstat (limited to 'git-merge-stupid.sh')
0 files changed, 0 insertions, 0 deletions