summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2008-12-21GIT 1.6.1-rc4v1.6.1-rc4Junio C Hamano1-1/+18
2008-12-21Always show which directory is not a git repositoryRichard Hartmann3-4/+4
2008-12-21Make help entries alphabeticalRichard Hartmann1-4/+4
2008-12-21Merge branch 'maint'Junio C Hamano1-1/+2
2008-12-21git-revert documentation: refer to new HOWTO on reverting faulty mergesBoyd Stephen Smith Jr1-0/+8
2008-12-21git-revert: record the parent against which a revert was madeRobin Rosenberg1-0/+5
2008-12-21Merge git://git.kernel.org/pub/scm/gitk/gitkJunio C Hamano2-63/+213
2008-12-22gitk: Force the focus to the main window on WindowsJohannes Sixt1-0/+5
2008-12-22gitk: Allow unbalanced quotes/braces in commit headersKevin Ballard1-2/+3
2008-12-22gitk: Update German translationChristian Stimming1-29/+157
2008-12-22gitk: Mark forgotten strings (header sentence parts in color chooser) for tra...Christian Stimming1-6/+6
2008-12-22gitk: Ensure that "Reset branch" menu entry is enabledJohannes Sixt1-1/+1
2008-12-22gitk: Use check-buttons' -text property instead of separate labelsJohannes Sixt1-20/+10
2008-12-22gitk: Map / to focus the search boxGiuseppe Bilotta1-2/+2
2008-12-21doc/git-fsck: change the way for getting heads' SHA1sMarkus Heidelberg1-1/+2
2008-12-21Documentation/git-show-branch: work around "single quote" typesetting glitchMarkus Heidelberg1-1/+1
2008-12-21send-email: futureproof split_addrs() subJunio C Hamano1-1/+1
2008-12-21Make sure lockfiles are unlocked when dying on SIGPIPEJunio C Hamano2-0/+18
2008-12-21fast-import.c: stricter strtoul check, silence compiler warningRené Scharfe1-4/+7
2008-12-21connect.c: stricter port validation, silence compiler warningRené Scharfe1-2/+2
2008-12-21Add a documentat on how to revert a faulty mergeNanako Shiraishi1-0/+179
2008-12-21Remove the requirement opaquelocktoken uri schemeKirill A. Korinskiy1-8/+6
2008-12-21git-sh-setup: Fix scripts whose PWD is a symlink into a git work-dirMarcel M. Cary3-2/+136
2008-12-19Documentation: fix typos, grammar, asciidoc syntaxMarkus Heidelberg1-1/+1
2008-12-19Merge branch 'maint' to sync with GIT 1.6.0.6Junio C Hamano26-48/+185
2008-12-19GIT 1.6.0.6v1.6.0.6Junio C Hamano6-38/+67
2008-12-19fast-import: make tagger information optionalJunio C Hamano2-11/+33
2008-12-19fast-export: deal with tag objects that do not have a taggerJohannes Schindelin3-5/+42
2008-12-19SubmittingPatches: mention the usage of real name in Signed-off-by: linesMiklos Vajna1-0/+3
2008-12-19git-mergetool: properly handle "git mergetool -- filename"David Aguilar1-0/+1
2008-12-19git-send-email: handle email address with quoted commaWu Fengguang1-3/+8
2008-12-19Documentation: fix typos, grammar, asciidoc syntaxMarkus Heidelberg13-25/+25
2008-12-19Documentation: sync example output with git outputMarkus Heidelberg4-11/+9
2008-12-18Fix type-mismatch compiler warning from diff_populate_filespec()René Scharfe1-1/+2
2008-12-18test overlapping ignore patternsMichael J Gruber1-0/+6
2008-12-17Merge branch 'lt/readlink'Junio C Hamano9-50/+62
2008-12-17Enable threaded delta search on Mac OS X/DarwinArjen Laarhoven1-0/+1
2008-12-17Clarify documentation of "git checkout <tree-ish> paths" syntaxNanako Shiraishi1-1/+1
2008-12-17Merge git://repo.or.cz/git-guiJunio C Hamano11-423/+3157
2008-12-17git-gui 0.12gitgui-0.12.0Shawn O. Pearce1-1/+1
2008-12-17githooks documentation: add a note about the +x modeMiklos Vajna1-0/+4
2008-12-17combine-diff.c: use strbuf_readlink()Junio C Hamano1-5/+5
2008-12-17builtin-blame.c: use strbuf_readlink()Junio C Hamano1-4/+1
2008-12-17make_absolute_path(): check bounds when seeing an overlong symlinkJunio C Hamano1-0/+2
2008-12-17Make 'prepare_temp_file()' ignore st_size for symlinksLinus Torvalds1-5/+4
2008-12-17Make 'diff_populate_filespec()' use the new 'strbuf_readlink()'Linus Torvalds1-9/+7
2008-12-17Make 'index_path()' use 'strbuf_readlink()'Linus Torvalds1-9/+5
2008-12-17Make 'ce_compare_link()' use the new 'strbuf_readlink()'Linus Torvalds1-14/+8
2008-12-17Add generic 'strbuf_readlink()' helper functionLinus Torvalds3-4/+30
2008-12-17git-gui: Get rid of the last remnants of GIT_CONFIG_LOCALJohannes Schindelin1-1/+0
2008-12-17doc/git-reset: add reference to git-stashMarkus Heidelberg1-0/+2
2008-12-17Documentation: fix description for enabling hooksMarkus Heidelberg2-2/+4
2008-12-17git-daemon documentation: use {tilde}Miklos Vajna1-2/+2
2008-12-16gitweb: do not run "git diff" that is PorcelainJunio C Hamano1-37/+3
2008-12-16GIT 1.5.6.6v1.5.6.6Junio C Hamano5-37/+33
2008-12-16GIT 1.5.5.6v1.5.5.6Junio C Hamano4-37/+23
2008-12-16GIT 1.5.4.7v1.5.4.7Junio C Hamano2-1/+11
2008-12-16gitweb: do not run "git diff" that is PorcelainJunio C Hamano1-36/+2
2008-12-15bash completion: Sync config variables with their man pagesLee Marlow1-7/+80
2008-12-15bash completion: Sort config completion variablesLee Marlow1-37/+40
2008-12-15Merge branch 'maint'Junio C Hamano4-3/+32
2008-12-15fast-import: close pack before unlinking itJohannes Schindelin1-1/+3
2008-12-15pager: do not dup2 stderr if it is already redirectedJunio C Hamano1-1/+2
2008-12-15git-show: do not segfault when showing a bad tagJunio C Hamano2-1/+27
2008-12-14Get rid of the last remnants of GIT_CONFIG_LOCALv1.6.1-rc3Johannes Schindelin4-8/+3
2008-12-14Documentation: Describe git-gui Tools menu configuration options.Alexander Gavrilov1-0/+51
2008-12-14git-fast-import possible memory corruption problemYONETANI Tomokazu1-3/+4
2008-12-13builtin-commit: remove unused message variableMarkus Heidelberg1-5/+0
2008-12-12Merge branch 'maint'Junio C Hamano1-1/+1
2008-12-12git-branch: display sha1 on branch deletionBrandon Casey2-2/+4
2008-12-12git-config.txt: fix a typoJim Meyering1-1/+1
2008-12-11Merge branch 'maint'Junio C Hamano4-7/+64
2008-12-11fsck: reduce stack footprintLinus Torvalds1-7/+31
2008-12-10rebase: improve error messages about dirty stateJeff King1-3/+6
2008-12-10make sure packs to be replaced are closed beforehandNicolas Pitre3-0/+33
2008-12-10Fix typo in comment in builtin-add.cAlexander Potashev1-1/+1
2008-12-10git-gui: Update Hungarian translation for 0.12Miklos Vajna1-90/+96
2008-12-10git-gui: Fixed typos in Swedish translation.Peter Krefting1-3/+3
2008-12-10Fix t4031Junio C Hamano1-1/+1
2008-12-09Merge branch 'maint'Junio C Hamano3-13/+63
2008-12-09diff: respect textconv in rewrite diffsJeff King2-13/+59
2008-12-09diff: fix handling of binary rewrite diffsJeff King2-1/+48
2008-12-09Fix typos in documentationAlexander Potashev2-2/+2
2008-12-09git-p4: Fix regression in p4Where method.Tor Arvid Lund1-3/+10
2008-12-09Improve language in git-merge.txt and related docsRalf Wildenhues9-49/+48
2008-12-09work around Python warnings from AsciiDocJunio C Hamano1-9/+9
2008-12-09git-gui: Updated Swedish translation (515t0f0u).Peter Krefting1-100/+117
2008-12-09git gui: update Italian translationMichele Ballabio1-90/+96
2008-12-09git-gui: Update Japanese translation for 0.12Nanako Shiraishi1-3/+8
2008-12-08Define linkgit macro in [macros] sectionAlexey Borzenkov1-0/+3
2008-12-08git-svn: Make following parents atomicDeskin Miller2-4/+54
2008-12-08git-gui: Starting translation for NorwegianFredrik Skolmli1-0/+2484
2008-12-08gitweb: Fix bug in insert_file() subroutineJakub Narebski2-1/+11
2008-12-08git-gui: Update German (completed) translation.Christian Stimming1-40/+239
2008-12-08git-gui: Update po template to include 'Mirroring %s' messageShawn O. Pearce1-89/+95
2008-12-08git-gui: Fix commit encoding handling.Alexander Gavrilov2-7/+5
2008-12-08git-gui: Fix handling of relative paths in blame.Alexander Gavrilov1-2/+16
2008-12-07diff: allow turning on textconv explicitly for plumbingJeff King1-0/+4
2008-12-07reorder ALLOW_TEXTCONV option settingJeff King3-4/+4
2008-12-07read-cache.c: typofix in commentJunio C Hamano1-1/+1
2008-12-07builtin-checkout.c: check error return from read_cache()Junio C Hamano1-2/+5
2008-12-07Point "stale" 1.6.0.5 documentation from the main git documentation pagev1.6.1-rc2Junio C Hamano1-1/+2
2008-12-07Revert "git-stash: use git rev-parse -q"Junio C Hamano1-6/+6
2008-12-07Update draft release notes for 1.6.1Junio C Hamano1-22/+1
2008-12-07Merge branch 'maint'Junio C Hamano5-31/+55
2008-12-07GIT 1.6.0.5v1.6.0.5Junio C Hamano1-15/+28
2008-12-07"git diff <tree>{3,}": do not reverse order of argumentsMatt McCutchen3-3/+31
2008-12-07tag: delete TAG_EDITMSG only on successful tagJeff King1-8/+20
2008-12-07gitweb: Make project specific override for 'grep' feature workJakub Narebski1-0/+1
2008-12-07http.c: use 'git_config_string' to get 'curl_http_proxy'Miklos Vajna1-7/+4
2008-12-07fetch-pack: Avoid memcpy() with src==dstThomas Rast1-1/+2
2008-12-06gitk: Fix bugs in blaming codePaul Mackerras1-3/+29
2008-12-05Update draft release notes to 1.6.1Junio C Hamano1-1/+17
2008-12-05Merge branch 'jc/am-options'Junio C Hamano12-5/+238
2008-12-05git-am: rename apply_opt_extra file to apply-optJunio C Hamano2-3/+2
2008-12-04Test that git-am does not lose -C/-p/--whitespace optionsJunio C Hamano11-0/+229
2008-12-04git-am: propagate --3way options as wellJunio C Hamano1-2/+7
2008-12-04git-am: propagate -C<n>, -p<n> options as wellJunio C Hamano1-7/+7
2008-12-04git-am --whitespace: do not lose the command line optionJunio C Hamano1-4/+4
2008-12-04git-p4: Fix bug in p4Where method.Tor Arvid Lund1-1/+9
2008-12-04Report symlink failures in merge-recursiveAlex Riesen1-1/+2
2008-12-04Make chdir failures visibleAlex Riesen2-3/+4
2008-12-04Make some of fwrite/fclose/write/close failures visibleAlex Riesen3-15/+45
2008-12-03Merge branch 'dm/svn-remote'Junio C Hamano2-1/+20
2008-12-03Merge branch 'jn/gitweb-utf8'Junio C Hamano1-16/+16
2008-12-03add stage to gitignoreJeff King1-0/+1
2008-12-03submodule: use git rev-parse -qMiklos Vajna1-3/+3
2008-12-03rebase: use git rev-parse -qMiklos Vajna1-2/+2
2008-12-03pull: use git rev-parse -qMiklos Vajna1-4/+4
2008-12-03lost-found: use git rev-parse -qMiklos Vajna1-1/+1
2008-12-03filter-branch: use git rev-parse -qMiklos Vajna1-1/+1
2008-12-03git-svn: Make branch use correct svn-remoteDeskin Miller2-1/+20
2008-12-03Merge branch 'jc/rm-i-t-a'Junio C Hamano8-32/+187
2008-12-03Merge branch 'maint'Junio C Hamano0-0/+0
2008-12-03Install git-stage in exec-pathJunio C Hamano1-0/+1
2008-12-02Merge branch 'jk/maint-commit-v-strip' into maintJunio C Hamano2-3/+78
2008-12-02xdiff: give up scanning similar lines earlyDavide Libenzi1-2/+13
2008-12-02Merge branch 'bc/maint-keep-pack' into maintJunio C Hamano9-36/+137
2008-12-02Merge branch 'js/mingw-rename-fix' into maintJunio C Hamano1-3/+12
2008-12-02gitweb: Fix handling of non-ASCII characters in inserted HTML filesJakub Narebski1-16/+16
2008-12-02git-stash: use git rev-parse -qMiklos Vajna1-6/+6
2008-12-02Merge branch 'maint'Junio C Hamano1-1/+0
2008-12-02t4030-diff-textconv: Make octal escape sequence more portableJohannes Sixt1-1/+1
2008-12-02Add a built-in alias for 'stage' to the 'add' commandScott Chacon2-0/+20
2008-12-02Add backslash to list of 'crud' characters in real nameLinus Torvalds1-0/+1
2008-12-02Makefile: introduce NO_PTHREADSJunio C Hamano4-1/+31
2008-12-02Documentation: describe how to "bisect skip" a range of commitsChristian Couder2-2/+21
2008-12-02bisect: fix "git bisect skip <commit>" and add tests casesChristian Couder2-3/+20
2008-12-02Update comment on gitweb_check/get_featureGiuseppe Bilotta1-1/+3
2008-12-02Merge branch 'gb/gitweb-feature'Junio C Hamano1-16/+32
2008-12-02Merge git://repo.or.cz/git-guiJunio C Hamano1-16/+27
2008-12-02Merge git://git.kernel.org/pub/scm/gitk/gitkJunio C Hamano2-17/+55
2008-12-02User's Manual: remove duplicated url at the end of Appendix BMiklos Vajna1-1/+0
2008-12-02git-gui: Teach start_push_anywhere_action{} to notice when remote is a mirror.Mark Burton1-16/+27
2008-12-02gitk: Add a menu option to start git guiAlexander Gavrilov1-0/+3
2008-12-02gitk: Make line origin search update the busy statusAlexander Gavrilov1-0/+3
2008-12-02gitk: Update German translationChristian Stimming1-8/+43
2008-12-02gitk: Fix bug in accessing undefined "notflag" variablePaul Mackerras1-5/+1
2008-12-02gitk: Highlight only when search type is "containing:".Paul Mackerras1-3/+4
2008-12-01GIT 1.6.1-rc1v1.6.1-rc1Junio C Hamano1-4/+15
2008-12-01Include git-gui--askpass in git-gui RPM packageJunio C Hamano1-0/+1
2008-11-30Merge git://git.kernel.org/pub/scm/gitk/gitkJunio C Hamano1-93/+157
2008-11-30Merge git://repo.or.cz/git-guiJunio C Hamano5-1533/+4243
2008-11-30send-email: do not reverse the command line argumentsJunio C Hamano2-1/+14
2008-11-30Merge branch 'maint'Junio C Hamano2-1/+23
2008-11-30Update draft release notes to 1.6.0.5Junio C Hamano1-0/+22
2008-11-30Merge branch 'st/maint-tag' into maintJunio C Hamano2-7/+23
2008-11-30Merge branch 'mk/maint-cg-push' into maintJunio C Hamano3-5/+75
2008-11-30generate-cmdlist.sh: avoid selecting synopsis at wrong placeNguyễn Thái Ngọc Duy1-1/+1
2008-11-30gitweb: make gitweb_check_feature a boolean wrapperGiuseppe Bilotta1-20/+36
2008-11-30gitweb: rename gitweb_check_feature to gitweb_get_featureJunio C Hamano1-23/+23
2008-11-30gitweb: fix 'ctags' feature check and othersJunio C Hamano1-7/+7
2008-11-30git add --intent-to-add: do not let an empty blob be committed by accidentJunio C Hamano5-5/+45
2008-11-28git add --intent-to-add: fix removal of cached emptinessJunio C Hamano4-4/+7
2008-11-28builtin-rm.c: explain and clarify the "local change" logicJunio C Hamano1-11/+42
2008-11-28Merge branch 'nd/narrow' (early part) into jc/add-i-t-aJunio C Hamano2-14/+95
2008-11-27Merge branch 'cc/bisect-skip'Junio C Hamano1-1/+18
2008-11-27Merge branch 'js/mingw-rename-fix'Junio C Hamano1-3/+12
2008-11-27Merge branch 'st/levenshtein'Junio C Hamano1-1/+38
2008-11-27Merge branch 'cr/remote-update-v'Junio C Hamano1-2/+6
2008-11-27Merge branch 'rs/strbuf-expand'Junio C Hamano9-204/+87
2008-11-27Merge branch 'mv/clone-strbuf'Junio C Hamano1-50/+59
2008-11-27Merge branch 'lt/preload-lstat'Junio C Hamano9-10/+122
2008-11-27Merge branch 'ta/quiet-pull'Junio C Hamano7-20/+126
2008-11-27Merge branch 'ph/send-email'Junio C Hamano3-75/+207
2008-11-27Merge branch 'maint'Junio C Hamano6-39/+22
2008-11-27Merge branch 'mv/fast-export' into maintJunio C Hamano2-2/+10
2008-11-27sha1_file.c: resolve confusion EACCES vs EPERMSam Vilain1-1/+1
2008-11-27sha1_file: avoid bogus "file exists" error messageJoey Hess1-1/+1
2008-11-27git checkout: don't warn about unborn branch if -f is already passedMatt McCutchen1-1/+1
2008-11-27bash: offer refs instead of filenames for 'git revert'SZEDER Gábor1-1/+1
2008-11-27bash: complete full refsSZEDER Gábor1-4/+15
2008-11-27bash: remove dashed command leftoversSZEDER Gábor1-33/+8
2008-11-27Merge branch 'pw/maint-p4' into maintJunio C Hamano1-1/+1
2008-11-27git-p4: fix keyword-expansion regexPete Wyckoff1-1/+1
2008-11-27Fix typos in the documentation.Ralf Wildenhues3-5/+5
2008-11-27Merge branch 'rw/maint-typofix' into rw/typofixJunio C Hamano4-4/+4
2008-11-27Fix typos in the documentation.Ralf Wildenhues4-4/+4
2008-11-26git-gui: update Japanese translationNanako Shiraishi1-294/+825
2008-11-26Merge branch 'maint'Junio C Hamano2-1/+25