Commit Graph

  • 7da3bf372c Rename static variable write_index to update_index in builtin-apply.c Junio C Hamano 2007-04-01 22:46:06 -0700
  • 81e1bc4768 Rename internal function "add_file_to_cache" in builtin-update-index.c Junio C Hamano 2007-04-01 22:07:26 -0700
  • ec0cc70469 Propagate cache error internal to refresh_cache() via parameter. Junio C Hamano 2007-04-01 21:34:34 -0700
  • 0424138d57 Fix bogus error message from merge-recursive error path Junio C Hamano 2007-04-01 21:13:27 -0700
  • b18825876a Show binary file size change in diff --stat Andy Parkins 2007-04-04 13:14:14 +0000
  • 79ee194e52 Honor -p<n> when applying git diffs Shawn O. Pearce 2007-04-04 11:19:14 -0400
  • 766b084f59 Fix dependency of common-cmds.h Junio C Hamano 2007-04-05 15:03:48 -0700
  • 566842f62b Fix lost-found to show commits only referenced by reflogs Shawn O. Pearce 2007-04-04 10:46:14 -0400
  • d72308e01c clean up and optimize nth_packed_object_sha1() usage Nicolas Pitre 2007-04-04 16:49:04 -0400
  • 01ebb9dc88 Fix renaming branch without config file Geert Bosch 2007-04-05 10:20:55 -0400
  • 1e31fbe24f DESTDIR support for git/contrib/emacs Ville Skyttä 2007-04-05 21:09:31 +0300
  • 957d6ea78f gitweb: Fix bug in "blobdiff" view for split (e.g. file to symlink) patches Jakub Narebski 2007-04-05 13:45:41 +0200
  • b24bace5ca Document --left-right option to rev-list. Brian Gernhardt 2007-04-05 10:53:07 -0400
  • 265d528032 Revert "builtin-archive: use RUN_SETUP" René Scharfe 2007-04-05 22:55:43 +0200
  • 5850cb645d rename contrib/hooks/post-receieve-email to contrib/hooks/post-receive-email. Gerrit Pape 2007-04-04 11:52:12 +0000
  • 18dbe04b1d MaintNotes: typofix Junio C Hamano 2007-04-04 16:07:32 -0700
  • d5ad36fe35 RPM spec: include git-p4 in the list of all packages. Junio C Hamano 2007-04-04 11:32:33 -0700
  • 2b93edbf32 rerere: make sorting really stable. Junio C Hamano 2007-04-04 14:12:03 -0700
  • 364b852352 Fix t4200-rerere for white-space from "wc -l" Brian Gernhardt 2007-04-04 15:39:05 -0400
  • 0ee949b815 MaintNotes: 2007-04-04 edition Junio C Hamano 2007-04-04 11:26:41 -0700
  • ae397f597b MaintNotes 2007-02-16 edition Junio C Hamano 2007-04-04 11:25:21 -0700
  • f6f2aa39ef git-gui: Brown paper bag fix division by 0 in blame Shawn O. Pearce 2007-04-04 12:08:46 -0400
  • 4372da3441 Always bind the return key to the default button Shawn O. Pearce 2007-04-04 11:45:33 -0400
  • 53a291a435 Do not break git-gui messages into multiple lines. Eygene Ryabinkin 2007-03-27 14:31:55 +0400
  • df0cd69558 Improve look-and-feel of the git-gui tool. Eygene Ryabinkin 2007-03-27 14:31:02 +0400
  • 3cf0bad830 Teach git-gui to use the user-defined UI font everywhere. Eygene Ryabinkin 2007-03-27 14:29:08 +0400
  • e2a1bc67d3 Allow wish interpreter to be defined with TCLTK_PATH Eygene Ryabinkin 2007-04-04 11:31:49 -0400
  • e421fc0797 git-svn: bail out on incorrect command-line options Eric Wong 2007-04-03 01:57:08 -0700
  • 3be8e720d9 gitweb: Quote hash keys, and do not use barewords keys Jakub Narebski 2007-04-01 22:22:21 +0200
  • a23f0a73d1 gitweb: Whitespace cleanup - tabs are for indent, spaces are for align (3) Jakub Narebski 2007-04-01 22:21:38 +0200
  • c81935348b Fix switching to a branch with D/F when current branch has file D. Junio C Hamano 2007-03-15 23:25:22 -0700
  • b8ba1535bd Fix twoway_merge that passed d/f conflict marker to merged_entry(). Junio C Hamano 2007-04-02 16:29:56 -0700
  • 2960a1d9ee Fix read-tree --prefix=dir/. Junio C Hamano 2007-04-02 12:40:19 -0700
  • 9a4d8fdc25 unpack-trees: get rid of *indpos parameter. Junio C Hamano 2007-04-02 15:06:59 -0700
  • 7f7932ab25 unpack_trees.c: pass unpack_trees_options structure to keep_entry() as well. Junio C Hamano 2007-04-02 00:06:12 -0700
  • 21cd8d00b6 add_cache_entry(): removal of file foo does not conflict with foo/bar Junio C Hamano 2007-03-30 01:55:37 -0700
  • c0718268e8 Merge branch 'jc/bisect' Junio C Hamano 2007-04-04 00:10:21 -0700
  • bdceecbbd7 Merge branch 'fl/doc' Junio C Hamano 2007-04-04 00:10:13 -0700
  • 1f71372711 Merge branch 'post1.5.1/blame.el' Junio C Hamano 2007-04-04 00:10:03 -0700
  • 80b6e39459 Merge branch 'post1.5.1/tcltk' Junio C Hamano 2007-04-04 00:09:52 -0700
  • cb7e3aefa6 Merge branch 'post1.5.1/p4' Junio C Hamano 2007-04-04 00:09:36 -0700
  • 95655d79ad Merge branch 'lt/dirwalk' Junio C Hamano 2007-04-04 00:09:32 -0700
  • 5e7f56ac33 git-read-tree --index-output=<file> Junio C Hamano 2007-03-31 23:27:41 -0700
  • 30ca07a249 _GIT_INDEX_OUTPUT: allow plumbing to output to an alternative index file. Junio C Hamano 2007-03-31 23:09:02 -0700
  • 3e0318a361 checkout: allow detaching to HEAD even when switching to the tip of a branch Junio C Hamano 2007-03-29 01:02:50 -0700
  • 89815cab95 GIT 1.5.1 v1.5.1 Junio C Hamano 2007-04-03 22:47:01 -0700
  • 045f5759c9 Merge 1.5.0.7 in Junio C Hamano 2007-04-03 21:52:14 -0700
  • fec598740d V & Doit: be careful with differences between branch and revision. Junio C Hamano 2007-04-03 21:41:33 -0700
  • 9694ec4533 GIT 1.5.0.7 v1.5.0.7 Junio C Hamano 2007-04-03 11:31:21 -0700
  • 04483524ec Documentation: A few minor fixes to Git User's Manual Jakub Narebski 2007-04-03 18:27:28 +0200
  • bbf4b41baf Plug memory leak in index-pack collision checking codepath. Nicolas Pitre 2007-04-03 12:33:46 -0400
  • eb3359663d rerere should not repeat the earlier hunks in later ones Junio C Hamano 2007-04-03 16:28:46 -0700
  • b9c9efd66c Meta/V & Doit: what is installed could be -dirty. Junio C Hamano 2007-04-03 17:23:15 -0700
  • 15ef670d68 Meta/V & Meta/Doit: adjust to exact release Junio C Hamano 2007-04-03 01:53:25 -0700
  • 3b798f2f56 Meta/Doit: avoid rebuilding already up-to-date branches. Junio C Hamano 2007-04-03 01:08:20 -0700
  • da437b7087 Meta/Make: allow building from a detached HEAD Junio C Hamano 2007-04-03 01:07:57 -0700
  • 4953c5961c Meta/V: highlight stale branch Junio C Hamano 2007-04-03 01:07:09 -0700
  • a8f4ef727a Hopefully final update to the draft Release Notes, preparing for 1.5.1 Junio C Hamano 2007-04-02 13:29:38 -0700
  • 711544b00c Clean up python class names. Simon Hausmann 2007-04-01 15:40:46 +0200
  • 2a9489c024 Fix "compilation" :) Simon Hausmann 2007-04-01 13:39:39 +0200
  • 3055178193 Optional Tck/Tk: ignore generated files. Junio C Hamano 2007-03-30 00:59:43 -0700
  • 68daee085c Eliminate checks of user-specified Tcl/Tk interpreter. Eygene Ryabinkin 2007-03-29 14:06:48 +0400
  • 6bdb18a9ce Rewrite Tcl/Tk interpreter path for the GUI tools. Eygene Ryabinkin 2007-03-28 04:22:02 -0700
  • 81b63c707e Add --with-tcltk and --without-tcltk to configure. Eygene Ryabinkin 2007-03-28 04:12:07 -0700
  • 3cfaf11b1d NO_TCLTK Eygene Ryabinkin 2007-03-28 04:00:23 -0700
  • faced1af71 Added correct Python path to the RPM specfile. Eygene Ryabinkin 2007-03-29 14:07:47 +0400
  • 5250929d60 Remove unused WITH_OWN_SUBPROCESS_PY from RPM spec Brian Gernhardt 2007-03-27 12:03:43 -0400
  • 7a585c0e6a Added git-p4 package to the list of git RPMs. Eygene Ryabinkin 2007-03-27 15:25:15 +0400
  • 7878b383d6 Add the WITH_P4IMPORT knob to the Makefile. Eygene Ryabinkin 2007-03-27 14:26:01 +0400
  • 3cc5ca3923 git-blame.el: pick a set of random colors for each git-blame turn Xavier Maillard 2007-03-28 18:44:34 +0200
  • 02f0559eba git-blame.el: separate git-blame-mode to ease maintenance Xavier Maillard 2007-03-26 23:00:54 +0200
  • 3a950e9a9c [PATCH] Improve look-and-feel of the gitk tool. Eygene Ryabinkin 2007-03-27 14:36:59 +0400
  • d59c4b6fb7 [PATCH] Teach gitk to use the user-defined UI font everywhere. Eygene Ryabinkin 2007-03-27 14:36:12 +0400
  • 9fc42d6091 Optimize directory listing with pathspec limiter. Linus Torvalds 2007-03-30 20:39:30 -0700
  • 0cf611a300 cvsserver: Use DBI->table_info instead of DBI->tables Frank Lichtenheld 2007-03-31 15:57:47 +0200
  • d8b6a1a10b cvsserver: Don't lie about binary mode in asciidoc documentation Frank Lichtenheld 2007-03-31 15:32:13 +0200
  • d6bad6610a git-svn: fail on rebase if we are unable to find a ref to rebase against Eric Wong 2007-03-31 14:00:18 -0700
  • a97e4075a1 Keep rename/rename conflicts of intermediate merges while doing recursive merge Alex Riesen 2007-03-31 13:49:38 +0200
  • 4f01748d51 contrib/workdir: add a simple script to create a working directory Julian Phillips 2007-03-27 00:15:32 +0100
  • 4557e0de5b Reimplement emailing part of hooks--update in contrib/hooks/post-receive-email Andy Parkins 2007-03-30 19:16:26 +0000
  • a6a15a9958 git-svn: avoid respewing similar error messages for missing paths Eric Wong 2007-03-30 17:54:48 -0700
  • 46efd2d93c Rename warn() to warning() to fix symbol conflicts on BSD and Mac OS Theodore Ts'o 2007-03-30 19:07:05 -0400
  • 86747c132b git-mailinfo fixes for patch munging Don Zickus 2007-03-30 12:18:45 -0400
  • 5ae917acdf gitweb: Support comparing blobs (files) with different names Jakub Narebski 2007-03-30 23:41:26 +0200
  • aa453216d1 Do not bother documenting fetch--tool Junio C Hamano 2007-03-30 01:03:09 -0700
  • a208362fad Update draft release notes for 1.5.1 Junio C Hamano 2007-03-30 00:56:36 -0700
  • e881192934 Merge branch 'maint' Junio C Hamano 2007-03-29 23:44:30 -0700
  • b275a0c9e7 git-quiltimport /bin/sh-ism fix Francis Daly 2007-03-29 22:38:20 +0100
  • 6f01e6b370 Bisect: Improve error message in "bisect_next_check". Christian Couder 2007-03-29 09:42:35 +0200
  • 18acb3e6c7 Merge branch 'master' of git://repo.or.cz/git/mergetool.git Junio C Hamano 2007-03-29 23:08:45 -0700
  • 27090aa1ea mergetool: Clean up description of files and prompts for merge resolutions Theodore Ts'o 2007-03-29 11:39:46 -0400
  • c9b50e6307 Fix the docs for git-p4 submit and turn git-p4 submit --master=foo into simply git-p4 submit mytopicbranch. Simon Hausmann 2007-03-29 19:15:24 +0200
  • 1346c99963 mergetool: Make git-rm quiet when resolving a deleted file conflict Theodore Ts'o 2007-03-29 10:05:02 -0400
  • 365cf979c4 mergetool: Add support for Apple Mac OS X's opendiff command Theodore Ts'o 2007-03-29 10:03:17 -0400
  • 5a174f1a2e mergetool: Fix abort command when resolving symlinks and deleted files Theodore Ts'o 2007-03-29 09:48:31 -0400
  • b7b36f92fd mergetool: Remove spurious error message if merge.tool config option not set Theodore Ts'o 2007-03-29 09:46:31 -0400
  • ddc0c49753 mergetool: factor out common code Theodore Ts'o 2007-03-29 09:39:59 -0400
  • 262c981ea7 mergetool: portability fix: don't use reserved word function Theodore Ts'o 2007-03-29 06:55:11 -0400
  • d1dc6959bb mergetool: portability fix: don't assume true is in /bin Theodore Ts'o 2007-03-29 06:46:59 -0400
  • ce5b6d752b mergetool: Don't error out in the merge case where the local file is deleted Theodore Ts'o 2007-03-27 18:00:03 -0400