2010-03-21 | cherry-pick, revert: add a label for ancestor Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2010-03-21 | revert: clarify label on conflict hunks Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2010-03-21 | compat: add mempcpy() Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2010-03-21 | checkout -m --conflict=diff3: add a label for ancestor Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2010-03-21 | merge_trees(): add ancestor label parameter for diff3... Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2010-03-21 | merge_file(): add comment explaining behavior wrt conflict... Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2010-03-21 | checkout --conflict=diff3: add a label for ancestor Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2010-03-21 | ll_merge(): add ancestor label parameter for diff3... Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2010-03-21 | merge-file --diff3: add a label for ancestor Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2010-03-21 | xdl_merge(): move file1 and file2 labels to xmparam... Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2010-03-21 | xdl_merge(): add optional ancestor label to diff3-style... Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2010-03-21 | tests: document cherry-pick behavior in face of conflicts Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2010-03-21 | tests: document format of conflicts from checkout -m Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2010-03-21 | .mailmap: Entries for Alex Bennée, Deskin Miller, Vitaly... Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2010-03-21 | revert: fix tiny memory leak in cherry-pick --ff Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2010-03-20 | Update draft release notes to 1.7.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2010-03-20 | Merge branch 'jk/maint-add-ignored-dir' |
diff | tree |
2010-03-20 | Merge branch 'ml/color-grep' |
diff | tree |
2010-03-20 | Merge branch 'jc/color-attrs' |
diff | tree |
2010-03-20 | Merge branch 'cc/reset-keep' |
diff | tree |
2010-03-20 | Merge branch 'fl/askpass' |
diff | tree |
2010-03-20 | Merge branch 'bg/apply-fix-blank-at-eof' |
diff | tree |
2010-03-20 | Merge branch 'bw/union-merge-refactor' |
diff | tree |
2010-03-20 | Merge branch 'maint' |
diff | tree |
2010-03-20 | Update draft release notes to 1.7.0.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2010-03-20 | rebase -i: use new --ff cherry-pick option Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2010-03-20 | fetch: Fix minor memory leak Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2010-03-20 | fetch: Future-proof initialization of a refspec on... Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2010-03-20 | fetch: Check for a "^{}" suffix with suffixcmp() Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2010-03-20 | Fix a spelling mistake in a git-p4 console message Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2010-03-20 | Use test_expect_success for test setups Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2010-03-20 | Modernize git calling conventions in hook templates Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2010-03-20 | Make templates honour SHELL_PATH and PERL_PATH Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2010-03-20 | daemon: parse_host_and_port SIGSEGV if port is specified Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2010-03-20 | Makefile: Fix occasional GIT-CFLAGS breakage Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2010-03-20 | Makefile: Fix CDPATH problem Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2010-03-20 | t/t5505-remote.sh: escape * to prevent interpretation... Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2010-03-20 | t5505: add missing && Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2010-03-20 | t5505: remove unnecessary subshell invocations Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2010-03-20 | notes.c: remove inappropriate call to return Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2010-03-20 | pull: replace unnecessary sed invocation Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2010-03-17 | Merge branch 'maint' |
diff | tree |
2010-03-17 | Documentation: receive.denyCurrentBranch defaults to... Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2010-03-17 | bash: complete *_HEAD refs if present Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2010-03-17 | Merge branch 'maint' |
diff | tree |
2010-03-17 | everyday: fsck and gc are not everyday operations Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2010-03-17 | Improve error messages from 'git stash show' Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2010-03-17 | daemon.c: avoid accessing ss_family member of struct... Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2010-03-17 | t/t1304: make a second colon optional in the mask ACL... Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2010-03-17 | t/t1304: set the ACL effective rights mask Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2010-03-17 | t/t1304: use 'test -r' to test readability rather than... Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2010-03-17 | t/t1304: set the Default ACL base entries Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2010-03-17 | t/t1304: avoid -d option to setfacl Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2010-03-16 | refs: ref entry with NULL sha1 is can be a dangling... Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2010-03-15 | grep: enable threading for context line printing Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2010-03-15 | Documentation/git-read-tree: clarify 2-tree merge Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2010-03-15 | Documentation/git-read-tree: fix table layout Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2010-03-15 | Merge branch 'sd/format-patch-to' |
diff | tree |
2010-03-15 | Merge branch 'tc/http-cleanup' |
diff | tree |
2010-03-15 | Merge branch 'tc/transport-verbosity' |
diff | tree |
2010-03-15 | Merge branch 'ld/push-porcelain' |
diff | tree |
2010-03-15 | Merge branch 'jh/notes' |
diff | tree |
2010-03-15 | rebase--interactive: don't require what's rebased to... Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2010-03-14 | git-send-email.perl - try to give real name of the... Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2010-03-14 | git-send-email.perl: add option --smtp-debug Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2010-03-14 | git-send-email.perl: improve error message in send_message() Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2010-03-14 | tests for "git add ignored-dir/file" without -f Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2010-03-14 | dir: fix COLLECT_IGNORED on excluded prefixes Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2010-03-14 | t0050: mark non-working test as such Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2010-03-14 | git status: ignoring untracked files must apply to... Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2010-03-14 | Merge branch 'maint' |
diff | tree |
2010-03-14 | don't use default revision if a rev was specified Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2010-03-13 | for_each_recent_reflog_ent(): use strbuf, fix offset... Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2010-03-13 | t/Makefile: remove test artifacts upon "make clean" Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2010-03-13 | blame: fix indent of line numbers Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2010-03-13 | Merge git://git.bogomips.org/git-svn |
diff | tree |
2010-03-13 | git status: Fix false positive "new commits" output... Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2010-03-13 | Refactor dirty submodule detection in diff-lib.c Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2010-03-13 | Merge branch 'maint' |
diff | tree |
2010-03-13 | notes: rework subcommands and parse options Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2010-03-13 | git-notes(1): add a section about the meaning of history Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2010-03-13 | notes: track whether notes_trees were changed at all Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2010-03-13 | notes: add shorthand --ref to override GIT_NOTES_REF Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2010-03-13 | commit --amend: copy notes to the new commit Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2010-03-13 | rebase: support automatic notes copying Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2010-03-13 | notes: implement helpers needed for note copying during... Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2010-03-13 | notes: implement 'git notes copy --stdin' Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2010-03-13 | rebase -i: invoke post-rewrite hook Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2010-03-13 | rebase: invoke post-rewrite hook Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2010-03-13 | commit --amend: invoke post-rewrite hook Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2010-03-13 | Documentation: document post-rewrite hook Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2010-03-13 | Support showing notes from more than one notes tree Thanks to Junio C Hamano for lots of feedback, which greatly Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2010-03-13 | test-lib: unset GIT_NOTES_REF to stop it from influencing... Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2010-03-12 | t5516: Use test_cmp when appropriate Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2010-03-12 | t9400: Use test_cmp when appropriate Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2010-03-10 | Merge branch 'sd/init-template' |
diff | tree |
2010-03-10 | Merge branch 'sh/am-keep-cr' |
diff | tree |
2010-03-10 | Merge branch 'cp/add-u-pathspec' |
diff | tree |
2010-03-10 | Makefile: update check-docs target Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2010-03-10 | Merge branch 'lt/deepen-builtin-source' |
diff | tree |