1. Stefan Saasen
  2. git

Commits

Author Commit Message Date Builds
Shawn O. Pearce
Enable reflogs by default in any repository with a working directory. New and experienced Git users alike are finding out too late that they forgot to enable reflogs in the current repository, and cannot use the information stored within it to recover from an incorrectly entered command such as `git reset --hard HEAD^^^` when they really meant HEAD^^ (aka HEAD~2). So enable reflogs by default in all future versions of Git, unless the user specifically disables it w…
Shawn O. Pearce
Provide more meaningful output from 'git init-db'. Back in the old days of Git when people messed around with their GIT_DIR environment variable more often it was nice to know whether or not git-init-db created a .git directory or used GIT_DIR. As most users at that time were rather technical UNIXy folk the message "defaulting to local storage area" made sense to some and seemed reasonable. But it doesn't really convey any meaning to the new Git …
Nicolas Pitre
make commit message a little more consistent and conforting It is nicer to let the user know when a commit succeeded all the time, not only the first time. Also the commit sha1 is much more useful than the tree sha1 in this case. This patch also introduces a -q switch to supress this message as well as the summary of created/deleted files. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Shawn O. Pearce
Avoid accessing a slow working copy during diffcore operations. The Cygwin folks have done a fine job at creating a POSIX layer on Windows That Just Works(tm). However it comes with a penalty; accessing files in the working tree by way of stat/open/mmap can be slower for diffcore than inflating the data from a blob which is stored in a packfile. This performance problem is especially an issue in merge-recursive when dealing with nearly 7000 added files, as w…
Junio C Hamano
Merge branch 'js/show' * js/show: git-show: grok blobs, trees and tags, too
Johannes Schindelin
git-show: grok blobs, trees and tags, too Since git-show is pure Porcelain, it is the ideal candidate to pretty print other things than commits, too. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
git-reset [--mixed] <tree> [--] <paths>... Sometimes it is asked on the list how to revert selected path in the index from a tree, most often HEAD, without affecting the files in the working tree. A similar operation that also affects the working tree files has been available in the form of "git checkout <tree> -- <paths>...". By definition --soft would never affect either the index nor the working tree files, and --hard is the way to ma…
Junio C Hamano
git-reset: make it work from within a subdirectory. If you typically sit in, say "src/", it's annoying to have to change directory to do a reset. This may need to be reworked when we add "git reset -- paths..." to encapsulate the "ls-tree $tree | update-index --index-info" pattern. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
git-fetch: make it work from within a subdirectory. Signed-off-by: Junio C Hamano <junkio@cox.net>
Johannes Schindelin
INSTALL: no need to have GNU diff installed Since a long time, we have inbuilt diff generation. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Merge branch 'maint' * maint: Bypass expensive content comparsion during rename detection.
Shawn O. Pearce
Bypass expensive content comparsion during rename detection. When comparing file contents during the second loop through a rename detection attempt we can skip the expensive byte-by-byte comparsion if both source and destination files have valid SHA1 values. This improves performance by avoiding either an expensive open/mmap to read the working tree copy, or an expensive inflate of a blob object. Unfortunately we still have to at least initialize the size…
Junio C Hamano
Update git-diff documentation Porcelain documentation should talk in terms of end-user workflow, not in terms of implementation details. Do not suggest update-index, but git-add instead. Explain differences among 0-, 1- and 2-tree cases not as differences of number of trees given to the command, but say why user would want to give these number of trees to the command in what situation. Signed-off-by: Junio C Hamano <junkio@…
Junio C Hamano
Merge branch 'jc/diff--cached' * jc/diff--cached: Revert "git-diff: Introduce --index and deprecate --cached."
Junio C Hamano
git-svn: allow both diff.color and color.diff The list concensus is to group color related configuration under "color.*" so let's be consistent. Inspired by Andy Parkins's patch to do the same for diff/log family. With fixes from Eric Wong. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
Nicolas Pitre
repacked packs should be read-only ... just like the other pack creating tools do. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
config documentation: group color items together. Signed-off-by: Junio C Hamano <junkio@cox.net>
Eric Wong
git-svn: correctly handle "(no author)" when using an authors file The low-level parts of the SVN library return NULL/undef for author-less revisions, whereas "(no author)" is a (svn) client convention. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
git-blame: show lines attributed to boundary commits differently. When blaming with revision ranges, often many lines are attributed to different commits at the boundary, but they are not interesting for the purpose of finding project history during that revision range. This outputs the lines blamed on boundary commits differently. When showing "human format" output, their SHA-1 are shown with '^' prefixed. In "porcelain format", the commit will be shown with a…
Junio C Hamano
Merge branch 'jc/read-tree-ignore' * jc/read-tree-ignore: read-tree: document --exclude-per-directory Loosen "working file will be lost" check in Porcelain-ish read-tree: further loosen "working file will be lost" check.
Junio C Hamano
Merge branch 'ew/rerere' * ew/rerere: rerere: record (or avoid misrecording) resolved, skipped or aborted rebase/am git-rerere: add 'gc' command. rerere: add clear, diff, and status commands
Junio C Hamano
Merge branch 'np/addcommit' * np/addcommit: git-commit: allow --only to lose what was staged earlier. Documentation/git-commit: rewrite to make it more end-user friendly. make 'git add' a first class user friendly interface to the index
Junio C Hamano
Merge branch 'lh/branch-rename' * lh/branch-rename: git-branch: let caller specify logmsg rename_ref: use lstat(2) when testing for symlink git-branch: add options and tests for branch renaming Conflicts: builtin-branch.c
Junio C Hamano
Merge branch 'jc/commit-careful' * jc/commit-careful: git-commit: show --summary after successful commit.
Junio C Hamano
Merge branch 'ap/clone-origin' * ap/clone-origin: Explicitly add the default "git pull" behaviour to .git/config on clone
Junio C Hamano
Merge branch 'jc/numstat' * jc/numstat: diff --numstat: show binary with '-' to match "apply --numstat"
Junio C Hamano
Merge branch 'rr/cvsexportcommit' * rr/cvsexportcommit: Make cvsexportcommit work with filenames with spaces and non-ascii characters.
Junio C Hamano
Merge branch 'ap/branch' * ap/branch: branch --color: change default color selection. Colourise git-branch output
Junio C Hamano
branch --color: change default color selection. Showing local and remote branches in green and red was simply overkill, as all we wanted was to make it easy to tell them apart (local ones can be built on top by committing, but the remote tracking ones can't). Use plain coloring for local branches and paint remotes in red. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Merge branch 'js/merge' * js/merge: merge-recursive: add/add really is modify/modify with an empty base Get rid of the dependency on RCS' merge program merge-file: support -p and -q; fix compile warnings Add builtin merge-file, a minimal replacement for RCS merge xdl_merge(): fix and simplify conflict handling xdl_merge(): fix thinko xdl_merge(): fix an off-by-one bug merge-recursive: use xdl_merge(). x…
  1. Prev
  2. Next