Commits

Author Commit Message Labels Comments Date
Jon Loeliger
Added Packing Heursitics IRC writeup. Signed-off-by: Jon Loeliger <jdl@jdl.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
blame -S <ancestry-file> This adds the -S <ancestry-file> option to blame, which is needed by the CVS server emulation. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Match ofs/cnt types in diff interface. Signed-off-by: Junio C Hamano <junkio@cox.net>
Mike McCormack
Add documentation for git-imap-send. Signed-off-by: Mike McCormack <mike@codeweavers.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Merge branch 'master' into next * master: blame.c: fix completely broken ancestry traversal.
Junio C Hamano
blame.c: fix completely broken ancestry traversal. Recent revision.c updates completely broken the assignment of blames by not rewriting commit->parents field unless explicitly asked to by the caller. The caller needs to set revs.parents. Signed-off-by: Junio C Hamano <junkio@cox.net>
Paul Mackerras
gitk: Fix incorrect invocation of getmergediffline Signed-off-by: Paul Mackerras <paulus@samba.org>
Pavel Roskin
[PATCH] gitk: Fix searching for filenames in gitk findcont should not accept any arguments. Signed-off-by: Pavel Roskin <proski@gnu.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
Junio C Hamano
Merge branch 'jc/date' into next * jc/date: date parsing: be friendlier to our European friends. Tweaks to make asciidoc play nice. git-commit: document --amend Avoid a crash if realloc returns a different pointer. Avoid a divide by zero if there's no messages to send. [PATCH] Provide configurable UI font for gitk [PATCH] gitk: Use git wrapper to run git-ls-remote. [PATCH] gitk: add key bindings for selecting firs…
Junio C Hamano
date parsing: be friendlier to our European friends. This does three things, only applies to cases where the user manually tries to override the author/commit time by environment variables, with non-ISO, non-2822 format date-string: - Refuses to use the interpretation to put the date in the future; recent kernel history has a commit made with 10/03/2006 which is recorded as October 3rd. - Adds '.' as the possible year-month-date separator.…
Francis Daly
Tweaks to make asciidoc play nice. Once the content has been generated, the formatting elves can reorder it to be pretty... Signed-off-by: Francis Daly <francis@daoine.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Merge branch 'jc/blame' into next * jc/blame: blame: use built-in xdiff
Junio C Hamano
Merge branch 'nh/http' into next * nh/http: Fix compile with expat, but an old curl version
Junio C Hamano
blame: use built-in xdiff This removes the last use of external diff from core git suite. Also addresses the use of index() -- elsewhere we tend to use strchr(). Signed-off-by: Junio C Hamano <junkio@cox.net>
Marco Roeland
git-commit: document --amend The "--amend" option is used to amend the tip of the current branch. This documentation text was copied straight from the commit that implemented it. Some minor format tweaks for asciidoc were taken from work by Francis Daly in commit b0d08a5.. It looks good now also in the html page. [jc: amended further to follow the recommendation by Francis in commit 3070b60]. Signed-off-by: Marco Roeland <…
Junio C Hamano
Merge branch 'jc/clone' * jc/clone: git-clone: fix handling of upsteram whose HEAD does not point at master.
Junio C Hamano
Merge branch 'pb/regex' * pb/regex: On some platforms, certain headers need to be included before regex.h Support for pickaxe matching regular expressions
Mike McCormack
Avoid a crash if realloc returns a different pointer. Signed-off-by: Junio C Hamano <junkio@cox.net>
Mike McCormack
Avoid a divide by zero if there's no messages to send. Signed-off-by: Junio C Hamano <junkio@cox.net>
Johannes Schindelin
Fix compile with expat, but an old curl version With an old curl version, git-http-push is not compiled. But git-http-fetch still needs to be linked with expat if NO_EXPAT is not defined. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk * git://git.kernel.org/pub/scm/gitk/gitk: [PATCH] Provide configurable UI font for gitk [PATCH] gitk: Use git wrapper to run git-ls-remote. [PATCH] gitk: add key bindings for selecting first and last commit gitk: Add a help menu item to display key bindings [PATCH] gitk: allow goto heads gitk: replace parent and children arrays with lists
Junio C Hamano
Merge branch 'jc/combine' into next * jc/combine: combine-diff: move the code to parse hunk-header into common library.
Junio C Hamano
combine-diff: move the code to parse hunk-header into common library. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Merge branches 'master' and 'jc/combine' into next * master: Add git-clean command diff_flush(): leakfix. parse_date(): fix parsing 03/10/2006 * jc/combine: combine-diff: refactor built-in xdiff interface.
Pavel Roskin
Add git-clean command This command removes untracked files from the working tree. This implementation is based on cg-clean with some simplifications. The documentation is included. [jc: with trivial documentation fix, noticed by Jakub Narebski] Signed-off-by: Pavel Roskin <proski@gnu.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Merge branch 'fix' * fix: diff_flush(): leakfix. parse_date(): fix parsing 03/10/2006
Junio C Hamano
diff_flush(): leakfix. We were leaking filepairs when output-format was set to NO_OUTPUT. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
combine-diff: refactor built-in xdiff interface. This refactors the line-by-line callback mechanism used in combine-diff so that other programs can reuse it more easily. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
parse_date(): fix parsing 03/10/2006 The comment associated with the date parsing code for three numbers separated with slashes or dashes implied we wanted to interpret using this order: yyyy-mm-dd yyyy-dd-mm mm-dd-yy dd-mm-yy However, the actual code had the last two wrong, and making it prefer dd-mm-yy format over mm-dd-yy. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Merge branch 'nh/http' into next * nh/http: http-fetch: add optional DAV-based pack list cvsimport: use git-update-ref when updating
  1. Prev
  2. Next