Commit Graph

  • baf5597ae4 Merge branch 'maint-1.5.1' into maint Junio C Hamano 2007-05-23 22:34:11 -0700
  • bfbd131f52 Remove a duplicate --not option in bash completion Shawn O. Pearce 2007-05-24 01:26:58 -0400
  • 1fd6bec9bc Teach bash completion about git-shortlog Shawn O. Pearce 2007-05-24 01:25:34 -0400
  • 5cfb4fe525 Hide the plumbing diff-{files,index,tree} from bash completion Shawn O. Pearce 2007-05-24 01:01:02 -0400
  • aac65ed1bc Fix possible coredump with fast-import --import-marks Shawn O. Pearce 2007-05-24 00:32:31 -0400
  • 654aaa37ab Refactor fast-import branch creation from existing commit Shawn O. Pearce 2007-05-24 00:05:19 -0400
  • 20f546a86c fast-import: Fix crash when referencing already existing objects Simon Hausmann 2007-05-23 23:01:49 +0200
  • b259157f3c fast-import: Fix uninitialized variable Simon Hausmann 2007-05-23 23:00:22 +0200
  • 5fdcf75c68 Documentation: fix git-config.xml generation James Bowes 2007-05-23 18:16:12 -0400
  • ebd8116870 Load the user map from p4 only once at run-time. Simon Hausmann 2007-05-24 00:24:52 +0200
  • 072570ee26 gitweb.perl - Optionally send archives as .zip files Mark Levedahl 2007-05-20 11:46:46 -0400
  • 2720de4261 Merge branch 'fl/cvsserver' Junio C Hamano 2007-05-23 14:54:18 -0700
  • b3fd1b2808 Fix multi-branch import with --silent. Simon Hausmann 2007-05-23 23:53:14 +0200
  • ad192f2888 Fix p4 execution in git-p4 rollback. Simon Hausmann 2007-05-23 23:44:19 +0200
  • 66a2f52395 Catch p4 errors in rollback early enough (before deleting refs!) Simon Hausmann 2007-05-23 23:40:48 +0200
  • ac3e0d79ee Oops, fill the /list/ correct with the p4 exit code. Simon Hausmann 2007-05-23 23:32:32 +0200
  • a6d5da36af Don't make len(p4Cmd("p4 changes -m 1 //foo/...")) == 0 succeed when the p4 command itself failed. Simon Hausmann 2007-05-23 23:27:31 +0200
  • ed82edc402 Merge branch 'ar/progress' Junio C Hamano 2007-05-23 11:39:58 -0700
  • 1654a3ba0c Merge branch 'maint' Junio C Hamano 2007-05-23 11:39:53 -0700
  • 421f9d1685 Fix the progress code to output LF only when it is really needed Alex Riesen 2007-05-23 18:07:25 +0200
  • 01c12a2312 pack-objects: clarification & option checks for --max-pack-size Dana How 2007-05-23 10:11:33 -0700
  • 0c66a78393 Make rollback work with locally imported branches Simon Hausmann 2007-05-23 20:07:57 +0200
  • 7ca055f75a Use git-for-each-ref to check whether the origin branch exists. Stephan Springl 2007-05-23 12:13:21 +0100
  • 65d2ade95e Avoid calling git symbolic-ref refs/heads/p4//HEAD (double slash) Simon Hausmann 2007-05-23 16:41:46 +0200
  • 32309f54ed Fix command line parameter parser of revert/cherry-pick Junio C Hamano 2007-05-22 22:52:59 -0700
  • 2555699aa2 Merge branch 'jn/lstree' Junio C Hamano 2007-05-23 00:17:47 -0700
  • e97593693e Merge branch 'maint' Junio C Hamano 2007-05-23 00:16:11 -0700
  • c80e07d495 Merge branch 'maint-1.5.1' into maint Junio C Hamano 2007-05-23 00:15:35 -0700
  • 38fe95c56d Move ko-master, sa/master and friends out of tags Junio C Hamano 2007-05-23 00:01:50 -0700
  • 6315d52a84 builtin-pack-objects: remove unnecessary code for no-delta Junio C Hamano 2007-05-22 23:04:49 -0700
  • 9902387d20 Document branch.autosetupmerge. Paolo Bonzini 2007-05-23 07:07:54 +0200
  • a396b29267 Doc updates Simon Hausmann 2007-05-23 00:33:34 +0200
  • 57284050a8 Use refs/heads/* instead of refs/heads/p4/* for local imports Simon Hausmann 2007-05-23 00:15:50 +0200
  • 01a9c9c5a8 Added support for --max-changes=<count> to ease import debugging Simon Hausmann 2007-05-23 00:07:35 +0200
  • a028a98e9a Added support for importing multiple branches into refs/heads instead of just refs/remotes using --import-local. Needs some further microfix but seems to work otherwise. Simon Hausmann 2007-05-23 00:03:08 +0200
  • 306fc12462 git-gui: Tighten internal pattern match for lib/ directory Shawn O. Pearce 2007-05-22 03:22:51 -0400
  • 240ba7f235 t9400: Add some basic pserver tests Frank Lichtenheld 2007-05-21 00:31:58 +0200
  • 1978659a74 t9400: Add some more cvs update tests Frank Lichtenheld 2007-05-21 00:31:57 +0200
  • 1d431b2235 t9400: Add test cases for config file handling Frank Lichtenheld 2007-05-21 00:31:56 +0200
  • a74db82e15 Teach "delta" attribute to pack-objects. Junio C Hamano 2007-05-19 00:39:31 -0700
  • bc32fed551 pack-objects: pass fullname down to add_object_entry() Junio C Hamano 2007-05-19 00:19:23 -0700
  • a3342a2f52 Merge branch 'mc/ws' Junio C Hamano 2007-05-21 23:57:05 -0700
  • 23615708e2 Teach git-describe how to run name-rev Shawn O. Pearce 2007-05-21 03:20:25 -0400
  • 302b9282c9 rename dirlink to gitlink. Martin Waitz 2007-05-21 22:08:28 +0200
  • fbf5df024e Merge branch 'maint' Junio C Hamano 2007-05-21 20:03:53 -0700
  • 523d12e500 git-cvsserver: fix disabling service via per-method config Junio C Hamano 2007-05-20 17:57:27 -0700
  • f95c6780c2 Merge branch 'maint-1.5.1' into maint Junio C Hamano 2007-05-21 18:42:35 -0700
  • 0ba956d331 git-status: respect core.excludesFile Johannes Schindelin 2007-05-22 01:12:17 +0100
  • 243bfd3399 SubmittingPatches: mention older C compiler compatibility Johannes Schindelin 2007-05-21 13:48:49 +0100
  • bc4e7d0358 git-daemon: don't ignore pid-file write failure Jim Meyering 2007-05-21 09:58:01 +0200
  • 7e12f1a629 [PATCH] gitk: Allow specifying tabstop as other than default 8 characters. Mark Levedahl 2007-05-20 11:45:50 -0400
  • 59ddaf3d19 [PATCH] gitk: Update fontsize in patch / tree list Mark Levedahl 2007-05-20 11:45:49 -0400
  • 60378c0c09 [PATCH] gitk: Make selection highlight color configurable Mark Levedahl 2007-05-20 12:12:48 -0400
  • 696cf493f7 gitk: Use the -q flag to git checkout Paul Mackerras 2007-05-22 09:52:00 +1000
  • 52102d4784 Fixes for rollback, delete branches that did not exist at the specified p4 change Simon Hausmann 2007-05-21 23:44:24 +0200
  • af8da89cb7 Fix branch detection in multi-branch imports Simon Hausmann 2007-05-21 23:25:51 +0200
  • 5834684d51 Added a rollback command for debugging. It sets back the heads of the p4 branches to the specified p4 change number or earlier. Simon Hausmann 2007-05-21 22:57:06 +0200
  • 7944f1425c Make git-p4 submit --direct safer by also creating a git commit Simon Hausmann 2007-05-21 11:04:26 +0200
  • cbf5efa61a Detect with git-p4 submit --direct when there are no changes in the working directory Simon Hausmann 2007-05-21 10:08:11 +0200
  • faf1bd2026 Fix git symbolic-ref warning on initial clone Simon Hausmann 2007-05-21 10:05:30 +0200
  • dc52403696 Fix error detection with git-p4 submit when the requested depot path is not in the client view. Simon Hausmann 2007-05-21 09:34:56 +0200
  • 077e1af598 git-apply: Fix removal of new trailing blank lines. Junio C Hamano 2007-05-20 23:51:06 -0700
  • 33be3e6550 Fix conversion from old style heads/p4 to remotes/p4/master Simon Hausmann 2007-05-21 08:44:16 +0200
  • 56d99c67d1 Update bash completion to ignore some more plumbing commands Jonas Fonseca 2007-05-19 23:35:21 +0200
  • 6b94b1a09a git-repack --max-pack-size: add option parsing to enable feature Dana L. How 2007-05-13 12:47:09 -0700
  • ebe27b137c git-repack --max-pack-size: split packs as asked by write_{object,one}() Dana L. How 2007-05-13 12:09:16 -0700
  • 17b08f2cd0 git-repack --max-pack-size: write_{object,one}() respect pack limit Dana L. How 2007-05-13 12:06:18 -0700
  • d01fb92f8d git-repack --max-pack-size: new file statics and code restructuring Dana L. How 2007-05-13 11:34:56 -0700
  • f02153696f Alter sha1close() 3rd argument to request flush only Dana L. How 2007-05-13 11:28:19 -0700
  • a5bbda8b7b Add an option to git-ls-tree to display also the size of blob Jakub Narebski 2007-05-19 22:08:11 +0200
  • b516968ff6 Update local tracking refs when pushing Daniel Barkalow 2007-05-15 22:50:19 -0400
  • 5d46c9d41f Add handlers for fetch-side configuration of remotes. Daniel Barkalow 2007-05-12 11:46:03 -0400
  • 6b62816cb1 Move refspec parser from connect.c and cache.h to remote.{c,h} Daniel Barkalow 2007-05-12 11:45:59 -0400
  • 5751f49010 Move remote parsing into a library file out of builtin-push. Daniel Barkalow 2007-05-12 11:45:53 -0400
  • efe7f35861 Teach 'git-apply --whitespace=strip' to remove empty lines at the end of file Marco Costalba 2007-05-20 14:45:59 +0200
  • 93d496a560 git-rev-list: Add regexp tuning options Petr Baudis 2007-05-19 02:13:29 +0200
  • 77e4e8bd9b gitweb: Add test t9500 for gitweb (as standalone script) Jakub Narebski 2007-05-19 02:19:20 +0200
  • 738a1154db Merge branch 'maint' Junio C Hamano 2007-05-20 19:58:03 -0700
  • 7df6ddf51e Merge branch 'maint-1.5.1' into maint Junio C Hamano 2007-05-20 19:57:00 -0700
  • 5b6dedd6a0 annotate: make it work from subdirectories. Junio C Hamano 2007-05-20 19:56:28 -0700
  • 0cb21911f4 git-config: Correct asciidoc documentation for --int/--bool Frank Lichtenheld 2007-05-21 00:12:58 +0200
  • cab333cb6a t1300: Add tests for git-config --bool --get Frank Lichtenheld 2007-05-21 00:12:57 +0200
  • 341dc1c179 Improved output for multi branch imports and noted another little todo item Simon Hausmann 2007-05-21 00:39:16 +0200
  • b1561ee256 Another (potentially life-saving) idea for submit --direct Simon Hausmann 2007-05-20 23:52:51 +0200
  • 24f7b53fdd Had an idea for debugging, record it :) Simon Hausmann 2007-05-20 23:42:22 +0200
  • 0a76f66524 unpack-trees.c: verify_uptodate: remove dead code Sven Verdoolaege 2007-05-20 19:26:37 +0200
  • 1472966c04 Use PATH_MAX instead of TEMPFILE_PATH_LEN Fernando J. Pereda 2007-05-20 15:35:46 +0200
  • 8a5fc95b43 Specifying --detect-branches is now only needed for the initial clone/sync. Afterwards it's turned on implicitly if more p4 branches than remotes/p4/master are found. Simon Hausmann 2007-05-20 23:39:40 +0200
  • 078f8380f6 branch: fix segfault when resolving an invalid HEAD Jonas Fonseca 2007-05-20 14:19:17 +0200
  • c1b296b9f1 Added support for git-p4 submit --direct (experimental) Simon Hausmann 2007-05-20 16:55:05 +0200
  • 47a130b7bf Use git format-patch and git apply --apply when extracting patches from git and applying them to a Perforce checkout. This should make it possible to apply git commits with binary files that cannot be handled by path. Simon Hausmann 2007-05-20 16:33:21 +0200
  • 64ffb06a9c Oops, not only /set/ gitdir on clone, also set it /correctly/ :) Simon Hausmann 2007-05-20 15:24:01 +0200
  • 59fa417109 Fix gitdir not being set when cloning. Needed for writing the p4 users cache. Simon Hausmann 2007-05-20 15:15:34 +0200
  • 41649bee8e MaintNotes: where is it found? Junio C Hamano 2007-05-20 02:52:53 -0700
  • 412cb45a0b MaintNotes update for 1.5.2/1.5.1.6 Junio C Hamano 2007-05-20 02:50:36 -0700
  • 45bde46bfb Merge branch 'dh/pack' Junio C Hamano 2007-05-20 02:19:19 -0700
  • e223249a13 Merge branch 'mst/connect' Junio C Hamano 2007-05-20 02:18:50 -0700
  • 063581e9b6 Merge branch 'sv/checkout' Junio C Hamano 2007-05-20 02:18:47 -0700
  • cc93020f52 Merge branch 'np/pack' Junio C Hamano 2007-05-20 02:18:43 -0700
  • a0f5b7f017 Merge branch 'tt/gc' Junio C Hamano 2007-05-20 02:18:40 -0700