Go to file
brian m. carlson 95104c7e25 rebase--merge: fix --skip with two conflicts in a row
If git rebase --merge encountered a conflict, --skip would not work if the
next commit also conflicted.  The msgnum file would never be updated with
the new patch number, so no patch would actually be skipped, resulting in an
inescapable loop.

Update the msgnum file's value as the first thing in call_merge.  This also
avoids an "Already applied" message when skipping a commit.  There is no
visible change for the other contexts in which call_merge is invoked, as the
msgnum file's value remains unchanged in those situations.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-06-16 13:29:16 -07:00
Documentation Git 1.9.4 2014-05-30 10:13:41 -07:00
block-sha1 block-sha1/sha1.c: have SP around arithmetic operators 2013-10-16 10:27:27 -07:00
builtin Merge branch 'jl/nor-or-nand-and' into maint 2014-04-09 12:03:26 -07:00
compat Merge branch 'jk/commit-dates-parsing-fix' into maint 2014-04-09 11:59:38 -07:00
contrib Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname' into maint 2014-05-28 15:46:36 -07:00
git-gui git-gui 0.19.0 2014-01-21 13:16:17 -08:00
gitk-git Merge git://ozlabs.org/~paulus/gitk 2014-01-23 08:50:50 -08:00
gitweb comments: fix misuses of "nor" 2014-03-31 15:29:27 -07:00
mergetools mergetools/diffmerge: support DiffMerge as a git mergetool 2013-10-13 16:00:57 -07:00
perl code and test: fix misuses of "nor" 2014-03-31 15:29:33 -07:00
po i18n: proposed command missing leading dash 2014-03-05 22:10:24 +08:00
ppc
t rebase--merge: fix --skip with two conflicts in a row 2014-06-16 13:29:16 -07:00
templates sample pre-commit hook: use --bool when retrieving config var 2013-09-24 12:26:49 -07:00
vcs-svn strbuf: introduce starts_with() and ends_with() 2013-12-05 14:12:52 -08:00
xdiff C: have space around && and || operators 2013-10-16 10:26:39 -07:00
.gitattributes
.gitignore Merge branch 'jk/remove-deprecated' 2013-12-12 14:18:34 -08:00
.mailmap .mailmap: switch to Thomas Rast's personal address 2013-10-13 14:28:27 -07:00
COPYING
GIT-VERSION-GEN Git 1.9.4 2014-05-30 10:13:41 -07:00
INSTALL
LGPL-2.1
Makefile Merge branch 'jl/nor-or-nand-and' into maint 2014-04-09 12:03:26 -07:00
README
RelNotes Git 1.9.4 2014-05-30 10:13:41 -07:00
abspath.c Merge branch 'ap/path-max' 2014-01-10 10:32:18 -08:00
aclocal.m4
advice.c
advice.h
alias.c replace {pre,suf}fixcmp() with {starts,ends}_with() 2013-12-05 14:13:21 -08:00
alloc.c alloc.c: have SP around arithmetic operators 2013-10-16 10:27:26 -07:00
archive-tar.c
archive-zip.c
archive.c archive.c: have SP around arithmetic operators 2013-10-16 10:27:26 -07:00
archive.h
argv-array.c
argv-array.h
attr.c replace {pre,suf}fixcmp() with {starts,ends}_with() 2013-12-05 14:13:21 -08:00
attr.h
base85.c base85.c: have SP around arithmetic operators 2013-10-16 10:27:26 -07:00
bisect.c replace {pre,suf}fixcmp() with {starts,ends}_with() 2013-12-05 14:13:21 -08:00
bisect.h
blob.c
blob.h
branch.c replace {pre,suf}fixcmp() with {starts,ends}_with() 2013-12-05 14:13:21 -08:00
branch.h
builtin.h builtin/help.c: speed up is_git_command() by checking for builtin commands first 2014-01-06 11:26:31 -08:00
bulk-checkin.c
bulk-checkin.h
bundle.c bundle: use argv-array 2013-11-12 13:32:11 -08:00
bundle.h
cache-tree.c
cache-tree.h
cache.h Merge branch 'jk/commit-dates-parsing-fix' into maint 2014-03-18 14:04:01 -07:00
check-builtins.sh
check-racy.c
check_bindir
color.c
color.h
column.c comments: fix misuses of "nor" 2014-03-31 15:29:27 -07:00
column.h
combine-diff.c Merge branch 'tr/log-full-diff-keep-true-parents' into maint 2013-09-18 11:59:05 -07:00
command-list.txt peek-remote: remove deprecated alias of ls-remote 2013-11-12 14:10:22 -08:00
commit-slab.h commit-slab: sizeof() the right type in xrealloc 2013-12-02 12:46:01 -08:00
commit.c Merge branch 'vm/octopus-merge-bases-simplify' 2014-01-10 10:33:45 -08:00
commit.h Merge branch 'bp/commit-p-editor' into maint 2014-04-08 12:07:06 -07:00
config.c Merge branch 'jk/config-path-include-fix' into maint 2014-03-18 14:00:15 -07:00
config.mak.in
config.mak.uname Merge branch 'jk/commit-dates-parsing-fix' into maint 2014-04-09 11:59:38 -07:00
configure.ac
connect.c Merge branch 'nd/shallow-clone' 2014-01-17 12:21:20 -08:00
connect.h connect.c: refactor url parsing 2013-12-09 14:54:48 -08:00
connected.c Merge branch 'nd/shallow-clone' 2014-01-17 12:21:20 -08:00
connected.h connected.c: add new variant that runs with --shallow-file 2013-12-10 16:14:18 -08:00
convert.c replace {pre,suf}fixcmp() with {starts,ends}_with() 2013-12-05 14:13:21 -08:00
convert.h
copy.c
credential-cache--daemon.c
credential-cache.c
credential-store.c
credential.c
credential.h
csum-file.c Merge branch 'jk/sha1write-void' 2014-01-10 10:33:09 -08:00
csum-file.h Merge branch 'jk/sha1write-void' 2014-01-10 10:33:09 -08:00
ctype.c
daemon.c Merge branch 'nd/daemon-informative-errors-typofix' 2014-01-10 10:32:59 -08:00
date.c Merge branch 'jk/commit-dates-parsing-fix' into maint 2014-03-18 14:04:01 -07:00
decorate.c
decorate.h
delta.h comments: fix misuses of "nor" 2014-03-31 15:29:27 -07:00
diff-delta.c
diff-lib.c pathspec: convert some match_pathspec_depth() to ce_path_match() 2014-02-24 14:36:52 -08:00
diff-no-index.c Merge branch 'jc/fix-diff-no-index-diff-opt-parse' into maint 2014-04-09 11:59:16 -07:00
diff.c comments: fix misuses of "nor" 2014-03-31 15:29:27 -07:00
diff.h Merge branch 'tg/diff-no-index-refactor' 2013-12-27 14:58:17 -08:00
diffcore-break.c
diffcore-delta.c
diffcore-order.c Merge branch 'sb/diff-orderfile-config' 2014-01-10 10:32:42 -08:00
diffcore-pickaxe.c
diffcore-rename.c
diffcore.h Merge branch 'nd/diff-quiet-stat-dirty' into maint 2014-03-18 13:59:56 -07:00
dir.c pathspec: pass directory indicator to match_pathspec_item() 2014-02-24 14:37:19 -08:00
dir.h pathspec: pass directory indicator to match_pathspec_item() 2014-02-24 14:37:19 -08:00
editor.c
entry.c Merge branch 'mh/remove-subtree-long-pathname-fix' into maint 2014-04-03 13:39:05 -07:00
environment.c Merge branch 'nd/shallow-clone' 2014-01-17 12:21:20 -08:00
exec_cmd.c
exec_cmd.h
fast-import.c replace {pre,suf}fixcmp() with {starts,ends}_with() 2013-12-05 14:13:21 -08:00
fetch-pack.c Merge branch 'jk/shallow-update-fix' into maint 2014-04-03 13:39:03 -07:00
fetch-pack.h Merge branch 'nd/shallow-clone' 2014-01-17 12:21:20 -08:00
fmt-merge-msg.h
fsck.c date: check date overflow against time_t 2014-02-24 10:12:58 -08:00
fsck.h
generate-cmdlist.sh
gettext.c gettext.c: detect the vsnprintf bug at runtime 2013-12-04 16:10:51 -08:00
gettext.h
git-add--interactive.perl code and test: fix misuses of "nor" 2014-03-31 15:29:33 -07:00
git-am.sh comments: fix misuses of "nor" 2014-03-31 15:29:27 -07:00
git-archimport.perl
git-bisect.sh typofixes: fix misspelt comments 2013-11-12 09:24:27 -08:00
git-compat-util.h Merge branch 'jk/commit-dates-parsing-fix' into maint 2014-04-09 11:59:38 -07:00
git-cvsexportcommit.perl
git-cvsimport.perl
git-cvsserver.perl Merge branch 'ak/cvsserver-stabilize-use-of-hash-keys' 2013-11-04 14:58:05 -08:00
git-difftool--helper.sh difftool: display the number of files in the diff queue in the prompt 2013-12-06 14:00:27 -08:00
git-difftool.perl difftool: support repositories with .git-files 2014-02-24 09:53:57 -08:00
git-filter-branch.sh Merge branch 'lc/filter-branch-too-many-refs' 2013-10-17 15:55:12 -07:00
git-instaweb.sh use @@PERL@@ in built scripts 2013-10-29 12:41:17 -07:00
git-merge-octopus.sh
git-merge-one-file.sh
git-merge-resolve.sh
git-mergetool--lib.sh remove #!interpreter line from shell libraries 2013-11-26 14:23:56 -08:00
git-mergetool.sh
git-p4.py Merge branch 'cl/p4-use-diff-tree' into maint 2014-05-08 10:01:32 -07:00
git-parse-remote.sh remove #!interpreter line from shell libraries 2013-11-26 14:23:56 -08:00
git-pull.sh Merge branch 'jk/pull-rebase-using-fork-point' 2014-01-17 12:04:29 -08:00
git-quiltimport.sh
git-rebase--am.sh rebase: avoid non-function use of "return" on FreeBSD 2014-04-17 10:13:29 -07:00
git-rebase--interactive.sh rebase: avoid non-function use of "return" on FreeBSD 2014-04-17 10:13:29 -07:00
git-rebase--merge.sh rebase--merge: fix --skip with two conflicts in a row 2014-06-16 13:29:16 -07:00
git-rebase.sh Revert "rebase: fix run_specific_rebase's use of "return" on FreeBSD" 2014-04-17 10:15:27 -07:00
git-relink.perl
git-remote-testgit.sh
git-request-pull.sh Merge branch 'jk/replace-perl-in-built-scripts' 2013-12-05 12:58:21 -08:00
git-send-email.perl Merge branch 'rk/send-email-ssl-cert' into maint 2014-02-13 13:38:19 -08:00
git-sh-i18n.sh remove #!interpreter line from shell libraries 2013-11-26 14:23:56 -08:00
git-sh-setup.sh Merge branch 'jn/pager-lv-default-env' 2014-01-13 11:33:35 -08:00
git-stash.sh Merge branch 'jc/stash-pop-not-popped' into maint 2014-04-03 13:39:03 -07:00
git-submodule.sh Merge branch 'fp/submodule-checkout-mode' 2014-01-17 12:21:20 -08:00
git-svn.perl git-svn: Warn about changing default for --prefix in Git v2.0 2013-10-12 22:30:53 +00:00
git-web--browse.sh web--browse: Add support for xdg-open 2013-10-30 13:54:15 -07:00
git.c Merge branch 'nd/shallow-clone' 2014-01-17 12:21:20 -08:00
git.rc Makefile: Fix compilation of Windows resource file 2014-01-23 10:00:28 -08:00
git.spec.in
gpg-interface.c
gpg-interface.h
graph.c graph: fix coloring around octopus merges 2013-10-18 12:48:48 -07:00
graph.h
grep.c
grep.h
hash.c
hash.h
help.c replace {pre,suf}fixcmp() with {starts,ends}_with() 2013-12-05 14:13:21 -08:00
help.h
hex.c
http-backend.c replace {pre,suf}fixcmp() with {starts,ends}_with() 2013-12-05 14:13:21 -08:00
http-fetch.c
http-push.c replace {pre,suf}fixcmp() with {starts,ends}_with() 2013-12-05 14:13:21 -08:00
http-walker.c
http.c Merge branch 'cc/starts-n-ends-with' 2013-12-17 12:02:44 -08:00
http.h comments: fix misuses of "nor" 2014-03-31 15:29:27 -07:00
ident.c Merge branch 'jk/split-broken-ident' into maint 2013-11-07 14:34:51 -08:00
imap-send.c replace {pre,suf}fixcmp() with {starts,ends}_with() 2013-12-05 14:13:21 -08:00
kwset.c
kwset.h
levenshtein.c
levenshtein.h
line-log.c Merge branch 'nd/magic-pathspec' 2013-10-30 12:10:33 -07:00
line-log.h
line-range.c
line-range.h
list-objects.c Merge branch 'jk/mark-edges-uninteresting' 2014-01-27 10:45:08 -08:00
list-objects.h
ll-merge.c
ll-merge.h
lockfile.c
log-tree.c Merge branch 'bc/log-decoration' 2014-01-10 10:32:39 -08:00
log-tree.h
mailmap.c Merge branch 'jc/strcasecmp-pure-inline' 2013-09-24 23:28:13 -07:00
mailmap.h
match-trees.c
merge-blobs.c
merge-blobs.h
merge-recursive.c Merge branch 'bk/refresh-missing-ok-in-merge-recursive' into maint 2014-03-18 14:02:38 -07:00
merge-recursive.h
merge.c
mergesort.c
mergesort.h
name-hash.c name-hash: stop storing trailing '/' on paths in index_state.dir_hash 2013-09-17 10:08:07 -07:00
notes-cache.c
notes-cache.h
notes-merge.c
notes-merge.h
notes-utils.c Merge branch 'cc/starts-n-ends-with' 2013-12-17 12:02:44 -08:00
notes-utils.h
notes.c replace {pre,suf}fixcmp() with {starts,ends}_with() 2013-12-05 14:13:21 -08:00
notes.h
object.c Merge branch 'mg/more-textconv' 2013-10-23 13:21:31 -07:00
object.h Merge branch 'mg/more-textconv' 2013-10-23 13:21:31 -07:00
pack-check.c
pack-revindex.c
pack-revindex.h
pack-write.c Merge branch 'jk/sha1write-void' 2014-01-10 10:33:09 -08:00
pack.h pack-objects: name pack files after trailer hash 2013-12-05 15:40:11 -08:00
pager.c Merge branch 'jn/pager-lv-default-env' 2014-01-13 11:33:35 -08:00
parse-options-cb.c
parse-options.c replace {pre,suf}fixcmp() with {starts,ends}_with() 2013-12-05 14:13:21 -08:00
parse-options.h parse-options: remove OPT_BOOLEAN 2013-12-09 11:24:16 -08:00
patch-delta.c
patch-ids.c
patch-ids.h
path.c Merge branch 'jk/config-path-include-fix' into maint 2014-03-18 14:00:15 -07:00
pathspec.c pathspec: convert some match_pathspec_depth() to ce_path_match() 2014-02-24 14:36:52 -08:00
pathspec.h Support pathspec magic :(exclude) and its short form :! 2013-12-06 13:00:39 -08:00
pkt-line.c replace {pre,suf}fixcmp() with {starts,ends}_with() 2013-12-05 14:13:21 -08:00
pkt-line.h comments: fix misuses of "nor" 2014-03-31 15:29:27 -07:00
preload-index.c pathspec: convert some match_pathspec_depth() to ce_path_match() 2014-02-24 14:36:52 -08:00
pretty.c Merge branch 'jk/commit-dates-parsing-fix' into maint 2014-03-18 14:04:01 -07:00
prio-queue.c
prio-queue.h
progress.c
progress.h
prompt.c Revert "prompt: clean up strbuf usage" 2014-01-02 10:21:40 -08:00
prompt.h
quote.c
quote.h
reachable.c
reachable.h
read-cache.c Merge branch 'bk/refresh-missing-ok-in-merge-recursive' into maint 2014-03-18 14:02:38 -07:00
reflog-walk.c
reflog-walk.h
refs.c Merge branch 'mh/safe-create-leading-directories' 2014-01-27 10:45:33 -08:00
refs.h Merge branch 'sb/refs-code-cleanup' 2013-11-01 07:38:58 -07:00
remote-curl.c Merge branch 'nd/shallow-clone' 2014-01-17 12:21:20 -08:00
remote-testsvn.c replace {pre,suf}fixcmp() with {starts,ends}_with() 2013-12-05 14:13:21 -08:00
remote.c Merge branch 'jl/nor-or-nand-and' into maint 2014-04-09 12:03:26 -07:00
remote.h Merge branch 'nd/shallow-clone' 2014-01-17 12:21:20 -08:00
replace_object.c replace_object: don't check read_replace_refs twice 2013-12-12 11:53:48 -08:00
rerere.c pathspec: pass directory indicator to match_pathspec_item() 2014-02-24 14:37:19 -08:00
rerere.h
resolve-undo.c pathspec: convert some match_pathspec_depth() to ce_path_match() 2014-02-24 14:36:52 -08:00
resolve-undo.h
revision.c pathspec: convert some match_pathspec_depth() to ce_path_match() 2014-02-24 14:36:52 -08:00
revision.h Merge branch 'jc/ref-excludes' 2013-12-05 12:59:09 -08:00
run-command.c commit: fix patch hunk editing with "commit -p -m" 2014-03-18 11:25:12 -07:00
run-command.h run-command: mark run_hook_with_custom_index as deprecated 2014-03-18 11:26:12 -07:00
send-pack.c Merge branch 'nd/shallow-clone' 2014-01-17 12:21:20 -08:00
send-pack.h remote.h: replace struct extra_have_objects with struct sha1_array 2013-12-10 16:14:15 -08:00
sequencer.c replace {pre,suf}fixcmp() with {starts,ends}_with() 2013-12-05 14:13:21 -08:00
sequencer.h
server-info.c
setup.c Merge branch 'mw/symlinks' into maint 2014-05-28 15:45:57 -07:00
sh-i18n--envsubst.c
sha1-array.c
sha1-array.h
sha1-lookup.c
sha1-lookup.h
sha1_file.c code and test: fix misuses of "nor" 2014-03-31 15:29:33 -07:00
sha1_name.c Merge branch 'jk/interpret-branch-name-fix' 2014-01-27 10:44:21 -08:00
shallow.c shallow: verify shallow file after taking lock 2014-03-17 15:03:32 -07:00
shell.c replace {pre,suf}fixcmp() with {starts,ends}_with() 2013-12-05 14:13:21 -08:00
shortlog.h
show-index.c
sideband.c
sideband.h
sigchain.c
sigchain.h
strbuf.c strbuf: introduce starts_with() and ends_with() 2013-12-05 14:12:52 -08:00
strbuf.h
streaming.c Merge branch 'ef/mingw-write' 2014-01-27 10:44:59 -08:00
streaming.h
string-list.c
string-list.h
submodule.c replace {pre,suf}fixcmp() with {starts,ends}_with() 2013-12-05 14:13:21 -08:00
submodule.h
symlinks.c
tag.c replace {pre,suf}fixcmp() with {starts,ends}_with() 2013-12-05 14:13:21 -08:00
tag.h
tar.h
test-chmtime.c comments: fix misuses of "nor" 2014-03-31 15:29:27 -07:00
test-ctype.c
test-date.c
test-delta.c
test-dump-cache-tree.c
test-genrandom.c
test-index-version.c
test-line-buffer.c replace {pre,suf}fixcmp() with {starts,ends}_with() 2013-12-05 14:13:21 -08:00
test-match-trees.c
test-mergesort.c
test-mktemp.c
test-parse-options.c
test-path-utils.c path-utils test: rename mingw_path function to print_path 2013-10-14 07:32:53 -07:00
test-prio-queue.c
test-read-cache.c
test-regex.c
test-revision-walking.c
test-run-command.c
test-scrap-cache-tree.c
test-sha1.c
test-sha1.sh
test-sigchain.c
test-string-list.c replace {pre,suf}fixcmp() with {starts,ends}_with() 2013-12-05 14:13:21 -08:00
test-subprocess.c
test-svn-fe.c
test-urlmatch-normalization.c
test-wildmatch.c
thread-utils.c
thread-utils.h
trace.c shallow.c: the 8 steps to select new commits for .git/shallow 2013-12-10 16:14:16 -08:00
transport-helper.c Merge branch 'ef/mingw-write' 2014-01-27 10:44:59 -08:00
transport.c Merge branch 'nd/shallow-clone' 2014-01-17 12:21:20 -08:00
transport.h fetch: add --update-shallow to accept refs that update .git/shallow 2013-12-10 16:14:17 -08:00
tree-diff.c pathspec: stop --*-pathspecs impact on internal parse_pathspec() uses 2013-10-28 09:57:36 -07:00
tree-walk.c Merge branch 'as/tree-walk-fix-aggressive-short-cut' into maint 2014-02-13 13:37:53 -08:00
tree-walk.h
tree.c Merge branch 'jk/free-tree-buffer' 2013-09-17 11:37:33 -07:00
tree.h Merge branch 'jk/free-tree-buffer' 2013-09-17 11:37:33 -07:00
unimplemented.sh
unix-socket.c
unix-socket.h
unpack-trees.c Merge branch 'jk/two-way-merge-corner-case-fix' into maint 2013-12-17 11:32:17 -08:00
unpack-trees.h
upload-pack.c shallow: automatically clean up shallow tempfiles 2014-02-27 12:07:13 -08:00
url.c
url.h
urlmatch.c urlmatch.c: recompute pointer after append_normalized_escapes 2013-09-12 15:27:01 -07:00
urlmatch.h
usage.c
userdiff.c userdiff: update Ada patterns 2014-02-05 10:45:51 -08:00
userdiff.h
utf8.c utf8.c: partially update to version 6.3 2014-04-09 10:14:05 -07:00
utf8.h
varint.c
varint.h
version.c
version.h
walker.c
walker.h
wildmatch.c
wildmatch.h
wrap-for-bin.sh
wrapper.c typofixes: fix misspelt comments 2013-11-12 09:24:27 -08:00
write_or_die.c
ws.c
wt-status.c Merge branch 'mm/status-porcelain-format-i18n-fix' into maint 2014-04-08 12:07:06 -07:00
wt-status.h status: disable translation when --porcelain is used 2014-03-26 12:56:30 -07:00
xdiff-interface.c
xdiff-interface.h
zlib.c

README

////////////////////////////////////////////////////////////////

	Git - the stupid content tracker

////////////////////////////////////////////////////////////////

"git" can mean anything, depending on your mood.

 - random three-letter combination that is pronounceable, and not
   actually used by any common UNIX command.  The fact that it is a
   mispronunciation of "get" may or may not be relevant.
 - stupid. contemptible and despicable. simple. Take your pick from the
   dictionary of slang.
 - "global information tracker": you're in a good mood, and it actually
   works for you. Angels sing, and a light suddenly fills the room.
 - "goddamn idiotic truckload of sh*t": when it breaks

Git is a fast, scalable, distributed revision control system with an
unusually rich command set that provides both high-level operations
and full access to internals.

Git is an Open Source project covered by the GNU General Public
License version 2 (some parts of it are under different licenses,
compatible with the GPLv2). It was originally written by Linus
Torvalds with help of a group of hackers around the net.

Please read the file INSTALL for installation instructions.

See Documentation/gittutorial.txt to get started, then see
Documentation/everyday.txt for a useful minimum set of commands, and
Documentation/git-commandname.txt for documentation of each command.
If git has been correctly installed, then the tutorial can also be
read with "man gittutorial" or "git help tutorial", and the
documentation of each command with "man git-commandname" or "git help
commandname".

CVS users may also want to read Documentation/gitcvs-migration.txt
("man gitcvs-migration" or "git help cvs-migration" if git is
installed).

Many Git online resources are accessible from http://git-scm.com/
including full documentation and Git related tools.

The user discussion and development of Git take place on the Git
mailing list -- everyone is welcome to post bug reports, feature
requests, comments and patches to git@vger.kernel.org (read
Documentation/SubmittingPatches for instructions on patch submission).
To subscribe to the list, send an email with just "subscribe git" in
the body to majordomo@vger.kernel.org. The mailing list archives are
available at http://news.gmane.org/gmane.comp.version-control.git/,
http://marc.info/?l=git and other archival sites.

The maintainer frequently sends the "What's cooking" reports that
list the current status of various development topics to the mailing
list.  The discussion following them give a good reference for
project status, development direction and remaining tasks.