summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2007-02-26GIT 1.5.0.2v1.5.0.2Junio C Hamano2-12/+18
2007-02-26git-remote: support remotes with a dot in the namePavel Roskin1-1/+1
2007-02-25Documentation: describe "-f/-t/-m" options to "git-remote add"Junio C Hamano1-0/+13
2007-02-25diff --cc: fix display of symlink conflicts during a merge.Junio C Hamano2-7/+34
2007-02-25Merge branch 'jc/merge-symlink' into maintJunio C Hamano2-2/+2
2007-02-25merge-recursive: fix longstanding bug in merging symlinksJunio C Hamano1-1/+1
2007-02-25merge-index: fix longstanding bug in merging symlinksJunio C Hamano1-1/+1
2007-02-25Add Release Notes to prepare for 1.5.0.2Junio C Hamano2-1/+60
2007-02-25Allow arbitrary number of arguments to git-pack-objectsRoland Dreier1-3/+9
2007-02-25rerere: do not deal with symlinks.Junio C Hamano1-5/+9
2007-02-25rerere: do not skip two conflicted paths next to each other.Junio C Hamano1-1/+1
2007-02-24Merge git://repo.or.cz/git-gui into maintJunio C Hamano1-6/+19
2007-02-25Don't modify CREDITS-FILE if it hasn't changed.Junio C Hamano1-6/+19
2007-02-24diff-patch: Avoid emitting double-slashes in textual patch.Junio C Hamano1-2/+4
2007-02-24Reword git-am 3-way fallback failure message.Junio C Hamano1-1/+1
2007-02-24Limit filename for format-patchRobin Rosenberg1-7/+21
2007-02-24core.legacyheaders: Use the description used in RelNotes-1.5.0Santi Béjar1-4/+11
2007-02-24git-show-ref --verify: Fail if called without a referenceDmitry V. Levin1-2/+4
2007-02-22git-diff: fix combined diffJohannes Schindelin1-1/+2
2007-02-22Fix 'git commit -a' in a newly initialized repositoryFredrik Kuivinen1-0/+4
2007-02-21Include git-gui credits file in dist.Shawn O. Pearce1-1/+2
2007-02-21Document the new core.bare configuration option.Shawn O. Pearce1-0/+12
2007-02-21Merge branch 'master' of git://repo.or.cz/git-gui into maintJunio C Hamano6-120/+308
2007-02-21Use gunzip -c over gzcat in import-tars example.Michael Loeffler1-3/+6
2007-02-21git-gui: Don't crash in citool mode on initial commit.gitgui-0.6.1Shawn O. Pearce1-8/+8
2007-02-21git-gui: Remove TODO list.Shawn O. Pearce1-44/+0
2007-02-21git-gui: Include browser in our usage message.Shawn O. Pearce1-1/+1
2007-02-21git-gui: Change summary of git-gui.Shawn O. Pearce1-1/+1
2007-02-21git-gui: Display all authors of git-gui.Shawn O. Pearce4-10/+136
2007-02-21git-gui: Use mixed path for docs on Cygwin.Shawn O. Pearce1-1/+1
2007-02-20Check for PRIuMAX rather than NO_C99_FORMAT in fast-import.c.Jason Riedy1-21/+16
2007-02-19Obey NO_C99_FORMAT in fast-import.c.Jason Riedy1-14/+23
2007-02-19Add a compat/strtoumax.c for Solaris 8.Jason Riedy3-0/+28
2007-02-19git-clone: Sync documentation to usage note.Christian Schlotter2-3/+3
2007-02-18GIT 1.5.0.1v1.5.0.1Junio C Hamano3-8/+13
2007-02-18Documentation/i18n.txt: it is i18n.commitencoding not core.commitencodingFredrik Kuivinen1-6/+6
2007-02-18Read the config in rev-listFredrik Kuivinen1-0/+1
2007-02-18git-gui: Correct crash when saving options in blame mode.Shawn O. Pearce1-15/+21
2007-02-17Update draft release notes for 1.5.0.1Junio C Hamano1-2/+19
2007-02-17Merge git://git.kernel.org/pub/scm/gitk/gitk into maintJunio C Hamano0-0/+0
2007-02-17Convert update-index references in docs to add.Shawn O. Pearce9-14/+15
2007-02-17Attempt to improve git-rebase lead-in description.Shawn O. Pearce1-8/+14
2007-02-16Do not take mode bits from index after type change.Junio C Hamano6-16/+46
2007-02-16git-blame: prevent argument parsing segfaultTommi Kyntola1-0/+3
2007-02-16git-merge: minor fix for no_trivial_merge_strategies.Junio C Hamano1-6/+9
2007-02-16git-gui: Expose the browser as a subcommand.Shawn O. Pearce1-5/+21
2007-02-15pretend-sha1: grave bugfix.Junio C Hamano1-1/+3
2007-02-15git-gui: Create new branches from a tag.Martin Koegler1-0/+30
2007-02-14GIT-VERSION-FILE: check ./version first.Junio C Hamano1-10/+11
2007-02-14sha1_file.c: Round the mmap offset to half the window size.Alexandre Julliard1-5/+3
2007-02-15Make gitk save and restore window pane position on Linux and Cygwin.Mark Levedahl1-10/+13
2007-02-15Make gitk save and restore the user set window position.Mark Levedahl1-5/+6
2007-02-15[PATCH] gitk: Use show-ref instead of ls-remoteJunio C Hamano1-2/+2
2007-02-15[PATCH] Make gitk work reasonably well on Cygwin.Junio C Hamano1-126/+150
2007-02-15[PATCH] gitk - remove trailing whitespace from a few lines.Mark Levedahl1-4/+4
2007-02-15Change git repo-config to git configPaul Mackerras1-1/+1
2007-02-14Make sure packedgitwindowsize is multiple of (pagesize * 2)Junio C Hamano2-5/+10
2007-02-14Add RelNotes 1.5.0.1Junio C Hamano1-0/+20
2007-02-14Still updating 1.5.0 release notes.Junio C Hamano1-5/+2
2007-02-14git-daemon: Avoid leaking the listening sockets into child processes.Alexandre Julliard1-0/+10
2007-02-14Clarify two backward incompatible repository options.Junio C Hamano1-2/+8
2007-02-14git-gui: Prefer version file over git-describe.Shawn O. Pearce1-6/+11
2007-02-13Makefile: update check-docs targetJunio C Hamano1-1/+4
2007-02-13cmd-list: add git-remoteJunio C Hamano1-0/+1
2007-02-13Documentation: Drop full-stop from git-fast-import title.Junio C Hamano1-1/+1
2007-02-14git-gui: Print version on the console.Shawn O. Pearce1-0/+7
2007-02-14git-gui: More consistently display the application name.Shawn O. Pearce1-4/+4
2007-02-13Minor corrections to release notesNicolas Pitre1-14/+12
2007-02-13git-gui: Permit merging tags into the current branch.Shawn O. Pearce1-3/+5
2007-02-13git-gui: Basic version check to ensure git 1.5.0 or later is used.Shawn O. Pearce1-0/+32
2007-02-13git-gui: Refactor 'exec git subcmd' idiom.Shawn O. Pearce1-23/+31
2007-02-14GIT 1.5.0v1.5.0Junio C Hamano1-1/+1
2007-02-13Add release notes to the distribution.Junio C Hamano5-2/+490
2007-02-13Merge branch 'master' of git://repo.or.cz/git-guiJunio C Hamano1-1/+1
2007-02-13Documentation: Moving out of detached HEAD does not warn anymore.Junio C Hamano1-16/+6
2007-02-13Mark places that need blob munging later for CRLF conversion.Linus Torvalds3-0/+3
2007-02-13Update RPM core package descriptionNicolas Pitre1-12/+9
2007-02-13Fix potential command line overflow in hooks--updateAndy Parkins1-1/+1
2007-02-13git-gc: run pack-refs by default unless the repo is bareJohannes Schindelin3-0/+23
2007-02-13git-gui: fix typo in GIT-VERSION-GEN, "/dev/null" not "/devnull"Andy Parkins1-1/+1
2007-02-12"git-fetch --tags $URL" should not overwrite existing tagsJunio C Hamano1-15/+2
2007-02-12for-each-reflog: not having $GIT_DIR/logs directory is not an error.Junio C Hamano1-1/+1
2007-02-12Do not forget to pack objects reachable from HEAD reflog.Junio C Hamano1-1/+1
2007-02-12Work around Subversion race in git-svn tests.Michael Spang5-2/+13
2007-02-12Clarify that git-update-server-info should be run for every git-pushPavel Roskin1-8/+8
2007-02-12blameview: Move the commit info to a pane below the blame window.Aneesh Kumar K.V1-7/+26
2007-02-12git merge documentation: -m is optionalMatthias Lederhofer1-1/+1
2007-02-12Make gitk save and restore window pane position on Linux and Cygwin.Mark Levedahl1-10/+13
2007-02-12Add RPM target for git-guiJunio C Hamano1-3/+23
2007-02-12Link git-gui into the master Makefile.Shawn O. Pearce1-2/+8
2007-02-12Merge branch 'master' of git://repo.or.cz/git-guiJunio C Hamano3-19/+58
2007-02-12git-gui: Change base version to 0.6.gitgui-0.6.0Shawn O. Pearce1-1/+1
2007-02-12git-gui: Guess our version accurately as a subproject.Shawn O. Pearce1-4/+37
2007-02-12git-gui: Handle gitgui tags in version gen.Shawn O. Pearce1-5/+3
2007-02-12git-gui: Generate a version file on demand.Shawn O. Pearce1-1/+5
2007-02-12git-gui: Rename GIT_VERSION to GITGUI_VERSION.Shawn O. Pearce3-6/+6
2007-02-12git-gui: Allow gitexecdir, INSTALL to be set by the caller.Shawn O. Pearce1-3/+7
2007-02-12import-tars: brown paper bag fix for file mode.Michael Loeffler1-3/+1
2007-02-12fast-import: Support reusing 'from' and brown paper bag fix reset.Shawn O. Pearce3-14/+77
2007-02-11Merge git-guiJunio C Hamano5-0/+6065
2007-02-11Add discussion section to git-tag documentation.Junio C Hamano1-0/+131
2007-02-11Teach git-am to pass -p option down to git-applyJunio C Hamano2-8/+6
2007-02-11Documentation: git-rebase -C<n>Junio C Hamano1-1/+1
2007-02-11Merge branch 'master' of git://repo.or.cz/git/fastimportJunio C Hamano4-11/+67
2007-02-11bash: Hide git-fast-import.Shawn O. Pearce1-0/+1
2007-02-11fast-import: Add tip about importing renames.Shawn O. Pearce1-0/+7
2007-02-11fast-import: Hide the pack boundary commits by default.Shawn O. Pearce3-11/+59
2007-02-11git-gui: Stop deleting gitk preferences.Shawn O. Pearce1-8/+0
2007-02-11Document that git-am can read standard input.Michael S. Tsirkin1-0/+4
2007-02-11Make gitk save and restore the user set window position.Mark Levedahl1-5/+6
2007-02-11t4016: test quoting funny pathnames in diff outputJunio C Hamano1-0/+66
2007-02-11diff.c: More logical file name quoting for renames in diffstat.Alexandre Julliard1-7/+27
2007-02-11diff.c: Properly quote file names in diff --summary output.Alexandre Julliard1-5/+12
2007-02-11diff.c: Reuse the pprint_rename function for diff --summary output.Alexandre Julliard1-27/+4
2007-02-11Make it easier to override path to asciidoc commandDotan Barak1-6/+7
2007-02-11Avoid ugly linewrap in git helpRen,bi(B Scharfe1-2/+2
2007-02-10Fixed some typos in git-repack docsMukund1-3/+3
2007-02-10git-svn: correctly handle boolean options via git-configEric Wong1-1/+1
2007-02-10Allow aliases to expand to shell commandsTheodore Ts'o2-0/+16
2007-02-10Print a sane error message if an alias expands to an invalid git commandTheodore Ts'o1-1/+8
2007-02-09diff_flush_name(): take struct diff_options parameter.Junio C Hamano1-4/+4
2007-02-09wt_status_prepare(): clean up structure initialization.Junio C Hamano1-8/+1
2007-02-09git-fetch: document automatic tag following.Junio C Hamano1-0/+8
2007-02-09remove mailmap.linuxNicolas Pitre1-42/+0
2007-02-09git-blame.el: Autoupdate while editingDavid Kågedal1-9/+86
2007-02-09git-blame.el: Doc fixes and cleanupDavid Kågedal1-4/+10
2007-02-09git-blame.el: blame unsaved changesDavid Kågedal1-21/+44
2007-02-09git-blame.el: improve color handlingDavid Kågedal1-14/+10
2007-02-09Handle uncommitted changes and cache descriptionsDavid Kågedal1-6/+20
2007-02-09git-blame: Change installation instructionsJakub Narebski1-4/+19
2007-02-09git-blame: Add Emacs Lisp file headers and GNU GPL boilerplateJakub Narebski1-3/+72
2007-02-08Documentation/git-pull: describe default behaviour and config interactionsJunio C Hamano1-0/+54
2007-02-09git-gui: Focus into blame panels on Mac OS.Shawn O. Pearce1-1/+3
2007-02-08reflog: handle $name => remotes/%s/HEAD mapping consistently for logsJunio C Hamano1-8/+21
2007-02-09git-gui: Improve annotated file display.Shawn O. Pearce1-22/+72
2007-02-08git-gui: Jump to the first annotation block as soon as its available.Shawn O. Pearce1-1/+6
2007-02-08git-gui: Redesign the display of annotated files.Shawn O. Pearce1-199/+160
2007-02-08log --reflog: use dwim_logJohannes Schindelin3-1/+15
2007-02-08format-patch -n: make sorting easier by padding numberJohannes Schindelin1-1/+12
2007-02-08git-gui: Use git-config now over git-repo-config.Shawn O. Pearce1-8/+8
2007-02-08git-gui: Relabel the Add All action.Shawn O. Pearce1-2/+2
2007-02-08git-gui: Select subcommands like git does.Shawn O. Pearce1-13/+35
2007-02-08log --reflog: honour --relative-dateJohannes Schindelin3-7/+10
2007-02-08git-gui: View blame from the command line.Shawn O. Pearce1-84/+136
2007-02-08for_each_reflog_ent: be forgiving about missing messageJohannes Schindelin1-3/+5
2007-02-08Merge branch 'master' of git://repo.or.cz/git/fastimportJunio C Hamano2-84/+190
2007-02-08git reflog showLinus Torvalds4-10/+58
2007-02-08add -C[NUM] to git-amMichael S. Tsirkin4-6/+25
2007-02-08Update git-log and git-show documentationMichael S. Tsirkin2-1/+4
2007-02-08git-gui: Optionally save commit buffer on exit.Shawn O. Pearce1-26/+28
2007-02-08git-gui: Separate transport/branch menus from multicommit.Shawn O. Pearce1-7/+12
2007-02-08git-gui: Refactor single_commit to a proc.Shawn O. Pearce1-14/+30
2007-02-08git-gui: Replace \ with \\ when showing paths.Shawn O. Pearce1-0/+1
2007-02-08git-gui: Support keyboard traversal in browser.Shawn O. Pearce1-38/+99
2007-02-08git-gui: Update known branches during rescan.Shawn O. Pearce1-1/+6
2007-02-08tar archive frontend for fast-import.Shawn O. Pearce1-0/+105
2007-02-08Correct spelling of fast-import in docs.Shawn O. Pearce1-78/+78
2007-02-07Read cvsimport options from repo-configJames Bowes1-1/+29
2007-02-07create_symref(): create leading directories as needed.Junio C Hamano1-0/+3
2007-02-08Correct some language in fast-import documentation.Shawn O. Pearce1-5/+6
2007-02-08Correct ^0 asciidoc syntax in fast-import docs.Shawn O. Pearce1-2/+2
2007-02-07GIT v1.5.0-rc4v1.5.0-rc4Junio C Hamano1-1/+1
2007-02-07Documentation: Add gfi to the main command list.Junio C Hamano1-0/+1
2007-02-07Fix "git log -z" behaviourLinus Torvalds1-4/+3
2007-02-07git-add -i: update removed path correctly.Junio C Hamano1-2/+1
2007-02-07t4200: skip gc-rerere test on systems with non GNU date.Junio C Hamano1-20/+17
2007-02-07Merge branch 'ml/gitk' (early part)Junio C Hamano1-132/+156
2007-02-07fast-import: Fix compile warningsJohannes Schindelin1-3/+5
2007-02-07for-each-reflog: fix case for empty log directoryJunio C Hamano1-1/+3
2007-02-07Merge branch 'master' of git://repo.or.cz/git/fastimportJunio C Hamano3-57/+277
2007-02-07git-clone --reference: work well with pack-ref'ed reference repositoryJunio C Hamano1-35/+21
2007-02-07Add a Tips and Tricks section to fast-import's manual.Shawn O. Pearce1-0/+87
2007-02-07Avoid ActiveState Perl IO in t800[12]Alex Riesen1-1/+2
2007-02-07Documentation: add KMail in SubmittingPatchesMichael1-1/+17
2007-02-07Don't crash fast-import if the marks cannot be exported.Shawn O. Pearce1-2/+6
2007-02-07Dump all refs and marks during a checkpoint in fast-import.Shawn O. Pearce2-9/+27
2007-02-07Teach fast-import how to sit quietly in the corner.Shawn O. Pearce2-33/+49
2007-02-07Teach fast-import how to clear the internal branch content.Shawn O. Pearce3-6/+94
2007-02-07Minor timestamp related documentation corrections for fast-import.Shawn O. Pearce1-7/+14
2007-02-06Remove git-merge-recurJunio C Hamano2-7/+2
2007-02-06Add deprecation notices.Junio C Hamano2-1/+3
2007-02-06Merge branch 'master' of git://repo.or.cz/git/fastimportJunio C Hamano5-0/+3139
2007-02-06Remove contrib/colordiffJunio C Hamano2-198/+0
2007-02-06Call make always with CFLAGS in git.specHorst H. von Brand1-1/+2
2007-02-06add replay and log to the usage string of git-bisectUwe Kleine-König1-1/+1
2007-02-06S_IFLNK != 0140000Junio C Hamano2-2/+2
2007-02-06Don't do non-fastforward updates in fast-import.Shawn O. Pearce3-17/+143
2007-02-06Support RFC 2822 date parsing in fast-import.Shawn O. Pearce3-24/+214
2007-02-06Minor fast-import documentation corrections.Shawn O. Pearce1-14/+18
2007-02-06Remove unnecessary null pointer checks in fast-import.Shawn O. Pearce1-10/+5
2007-02-06Correct fast-import timezone documentation.Shawn O. Pearce1-2/+2
2007-02-06annotate: fix for cvsserver.Junio C Hamano2-4/+7
2007-02-06gitweb: fix mismatched parenthesisJunio C Hamano1-1/+1
2007-02-06git-push: allow globbing wildcard refspec.Junio C Hamano1-32/+82
2007-02-06Correct minor style issue in fast-import.Shawn O. Pearce1-17/+17
2007-02-06Correct compiler warnings in fast-import.Shawn O. Pearce1-4/+5
2007-02-06Remove --branch-log from fast-import.Shawn O. Pearce2-39/+0
2007-02-05bash: Complete git-remote subcommands.Shawn O. Pearce1-0/+28
2007-02-05bash: Support git-rebase -m continuation completion.Shawn O. Pearce1-1/+1
2007-02-05Initial draft of fast-import documentation.Shawn O. Pearce1-0/+655