Commits

Show all
Author Commit Message Labels Comments Date
Junio C Hamano
GIT 1.6.2-rc0 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.6.2-rc0
Junio C Hamano
Merge branch 'tr/add-p-single' * tr/add-p-single: add -p: import Term::ReadKey with 'require' add -p: print errors in separate color add -p: prompt for single characters
Junio C Hamano
Merge branch 'js/filter-branch-submodule' * js/filter-branch-submodule: filter-branch: do not consider diverging submodules a 'dirty worktree' filter-branch: Fix fatal error on bare repositories
Junio C Hamano
Merge branch 'maint' * maint: GIT 1.6.1.3 Conflicts: GIT-VERSION-GEN RelNotes
Alexandre Julliard
emacs: Remove the no longer maintained vc-git package. vc-git is distributed with Emacs since version 22.2, and is maintained in the Emacs CVS tree. This file is obsolete and causes trouble for people who want to add contrib/emacs to their load-path. Signed-off-by: Alexandre Julliard <julliard@winehq.org>
Alexandre Julliard
git.el: Add some notes about Emacs versions compatibility. Signed-off-by: Alexandre Julliard <julliard@winehq.org>
Alexandre Julliard
git.el: Use integer instead of character constants in case statement. This is for compatibility with XEmacs. Reported by Vassili Karpov. Signed-off-by: Alexandre Julliard <julliard@winehq.org>
Alexandre Julliard
git.el: Set a regexp for paragraph-separate in log-edit mode. This allows using fill-paragraph on the log message without interference from the various header fields. Signed-off-by: Alexandre Julliard <julliard@winehq.org>
Alexandre Julliard
git.el: Make git-run-command-region display the error if any. This makes it easier to figure out why a commit has failed. Signed-off-by: Alexandre Julliard <julliard@winehq.org>
Alexandre Julliard
git.el: Add commands for cherry-pick and revert. Support for cherry-picking and reverting commits, with automatic formatting of the commit log message. Bound to C-c C-p and C-c C-v respectively. Signed-off-by: Alexandre Julliard <julliard@winehq.org>
Alexandre Julliard
git.el: Add a command to create a new branch. Prompts for a branch name, create a new branch at HEAD and switch to it. Bound to C-c C-b by default. Based on a patch by Rémi Vanicat <vanicat@debian.org>. Signed-off-by: Alexandre Julliard <julliard@winehq.org>
Alexandre Julliard
git.el: Add a checkout command. Prompts for a branch name and checks it out. Bound to C-c C-o by default. Based on a patch by Rémi Vanicat <vanicat@debian.org>. Signed-off-by: Alexandre Julliard <julliard@winehq.org>
Junio C Hamano
GIT 1.6.1.3 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.6.1.3
Thomas Rast
add -p: import Term::ReadKey with 'require' eval{use...} is no good because the 'use' is evaluated at compile time, so manually 'require' it. We need to forward declare the functions we use, otherwise Perl raises a compilation error. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'js/maint-remote-remove-mirror' * js/maint-remote-remove-mirror: builtin-remote: make rm operation safer in mirrored repository builtin-remote: make rm() use properly named variable to hold return value
Junio C Hamano
Merge branch 'js/notes' * js/notes: git-notes: fix printing of multi-line notes notes: fix core.notesRef documentation Add an expensive test for git-notes Speed up git notes lookup Add a script to edit/inspect notes Introduce commit notes Conflicts: pretty.c
Junio C Hamano
Merge branch 'jc/refuse-push-to-current' * jc/refuse-push-to-current: receive-pack: explain what to do when push updates the current branch
Junio C Hamano
Merge branch 'rc/http-push' * rc/http-push: http-push: wrap signature of get_remote_object_url http-push: add back underscore separator before lock token http-push.c: get_remote_object_url() is only used under USE_CURL_MULTI http-push: refactor request url creation
Junio C Hamano
Merge branch 'gt/utf8-width' * gt/utf8-width: builtin-blame.c: Use utf8_strwidth for author's names utf8: add utf8_strwidth()
Junio C Hamano
Merge branch 'jk/head-symref' * jk/head-symref: symbolic ref: refuse non-ref targets in HEAD validate_headref: tighten ref-matching to just branches
Junio C Hamano
Merge branch 'cb/mergetool' * cb/mergetool: mergetool: fix running mergetool in sub-directories mergetool: Add a test for running mergetool in a sub-directory mergetool: respect autocrlf by using checkout-index
Junio C Hamano
Merge branch 'maint' * maint: Fixed broken git help -w when installing from RPM
Junio C Hamano
Merge branch 'maint-1.6.0' into maint * maint-1.6.0: Fixed broken git help -w when installing from RPM
Junio C Hamano
Merge branch 'jc/maint-apply-fix' into maint * jc/maint-apply-fix: builtin-apply.c: do not set bogus mode in check_preimage() for deleted path
Junio C Hamano
Merge branch 'am/maint-push-doc' into maint * am/maint-push-doc: Documentation: rework src/dst description in git push Documentation: more git push examples Documentation: simplify refspec format description
Junio C Hamano
Merge branch 'sg/maint-gitdir-in-subdir' into maint * sg/maint-gitdir-in-subdir: Fix gitdir detection when in subdir of gitdir
Junio C Hamano
Merge branch 'lt/maint-wrap-zlib' into maint * lt/maint-wrap-zlib: Wrap inflate and other zlib routines for better error reporting Conflicts: http-push.c http-walker.c sha1_file.c
Junio C Hamano
Merge branch 'jc/maint-split-diff-metainfo' into maint * jc/maint-split-diff-metainfo: diff.c: output correct index lines for a split diff
Junio C Hamano
Merge branch 'js/maint-all-implies-HEAD' into maint * js/maint-all-implies-HEAD: bundle: allow the same ref to be given more than once revision walker: include a detached HEAD in --all
Junio C Hamano
Merge branch 'kc/maint-diff-bwi-fix' into maint * kc/maint-diff-bwi-fix: Fix combined use of whitespace ignore options to diff test more combinations of ignore-whitespace options to diff
  1. Prev
  2. Next