summaryrefslogtreecommitdiffstats
path: root/merge-index.c (unfollow)
Commit message (Expand)AuthorFilesLines
2006-08-02Fix header breakage due to redefining PATH_MAX.Ramsay Allan Jones1-4/+1
2006-08-02Add NO_C99_FORMAT to support older compilers.Ramsay Allan Jones3-6/+35
2006-08-02New tests and en-passant modifications to mktag.Ramsay Allan Jones2-17/+245
2006-08-02Fix installation of templates on ancient systems.Ramsay Allan Jones2-8/+6
2006-08-02Fix annotate test script; notice when git-annotate fails.Ramsay Allan Jones1-1/+2
2006-08-02Ensure git-clone exits with error if perl script fails.Ramsay Allan Jones1-2/+3
2006-08-01pager: config variable pager.colorMatthias Lederhofer5-1/+12
2006-08-01Builtins: control the use of pager from the command table.Junio C Hamano2-6/+8
2006-07-31Fix up some fallout from "setup_git_directory()" cleanupsLinus Torvalds1-8/+7
2006-07-31Fix double "close()" in ce_compare_dataLinus Torvalds1-1/+1
2006-07-31git-checkout: allow "checkout HEAD -- path"Junio C Hamano1-0/+4
2006-07-31rebase: Make the fast-fowarding message more user-friendly by using branch na...Robert Shearman1-1/+1
2006-07-31rebase: Fix the detection of fast-forwarding of the current branch to upstream.Robert Shearman1-8/+5
2006-07-31tar-tree: illustrate an obscure feature betterJohannes Schindelin1-0/+5
2006-07-31git.c: allow alias expansion without a git directoryMatthias Lederhofer1-40/+36
2006-07-31setup_git_directory_gently: do not barf when GIT_DIR is given.Matthias Lederhofer1-0/+4
2006-07-30Build on Debian GNU/kFreeBSDGerrit Pape1-0/+3
2006-07-29Call setup_git_directory() much earlierLinus Torvalds35-144/+128
2006-07-29Call setup_git_directory() earlyLinus Torvalds12-22/+25
2006-07-29Display an error from update-ref if target ref name is invalid.Shawn Pearce2-0/+17
2006-07-29Fix http-fetchJohannes Schindelin1-3/+3
2006-07-28t4103: fix binary patch application test.Junio C Hamano1-2/+2
2006-07-28git-apply -R: binary patches are irreversible for now.Junio C Hamano1-0/+6
2006-07-28Teach git-apply about '-R'Johannes Schindelin2-12/+77
2006-07-28Makefile: ssh-pull.o depends on ssh-fetch.cJohannes Schindelin1-0/+2
2006-07-28log and diff family: honor config even from subdirectoriesJunio C Hamano5-7/+11
2006-07-28git-reset: detect update-ref error and report it.Junio C Hamano1-1/+4
2006-07-28lost-found: use fsck-objects --fullJunio C Hamano1-1/+1
2006-07-28Teach git-http-fetch the --stdin switchPetr Baudis2-17/+36
2006-07-28Teach git-local-fetch the --stdin switchPetr Baudis4-10/+74
2006-07-28Make pull() support fetching multiple targets at oncePetr Baudis5-37/+49
2006-07-28Make pull() take some implicit data as explicit argumentsPetr Baudis5-17/+12
2006-07-28mailinfo: accept >From in message headerMichael S. Tsirkin1-1/+1
2006-07-27Remove -d from *-fetch usage stringsPetr Baudis3-4/+4
2006-07-27daemon: documentation for --reuseaddr, --detach and --pid-fileMatthias Lederhofer2-2/+13
2006-07-26cvsserver: imitate git-update-ref when committingJohannes Schindelin1-4/+4
2006-07-26instaweb: Be more clear if httpd or the browser failJohannes Schindelin1-2/+7
2006-07-26builtin git-mv: support moving directoriesJohannes Schindelin2-5/+86
2006-07-26Make git-mv a builtinJohannes Schindelin8-295/+269
2006-07-26Extract helper bits from c-merge-recursive workJohannes Schindelin4-45/+172
2006-07-26git-cvsserver: support multiline commit messagesJohannes Schindelin1-3/+6
2006-07-26t7001: add test for git-mv dir1 dir2/Johannes Schindelin1-0/+15
2006-07-26gitweb: fix two warningsJohannes Schindelin1-2/+2
2006-07-26git-instaweb: respect bindir from MakefileJohannes Schindelin1-1/+1
2006-07-26git-instaweb: some Apache have mod_cgi builtinJohannes Schindelin1-1/+3
2006-07-26t4112: simplify the test and remove unneeded working tree file.Junio C Hamano1-26/+2
2006-07-26Extend testing git-mv for renaming of subdirectoriesJosef Weidendorfer1-0/+21
2006-07-25git wrapper: add --git-dir=<path> and --bare optionsJohannes Schindelin3-47/+58
2006-07-25Allow an alias to start with "-p"Johannes Schindelin1-6/+30
2006-07-25cvsserver: avoid warning about active db handlesv1.4.2-rc2Johannes Schindelin1-14/+56