summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2010-08-19Git 1.7.2.2v1.7.2.2Junio C Hamano4-3/+26
2010-08-19Merge branch 'tr/xsize-bits' into maintJunio C Hamano1-0/+2
2010-08-19Merge branch 'jc/sha1-name-find-fix' into maintJunio C Hamano1-10/+11
2010-08-18Merge branch 'sp/fix-smart-http-deadlock-on-error' into maintJunio C Hamano1-2/+3
2010-08-12push: mention "git pull" in error message for non-fast forwardsMatthieu Moy1-2/+2
2010-08-12Standardize do { ... } while (0) styleJonathan Nieder4-10/+10
2010-08-12t/t7003: replace \t with literal tab in sed expressionBrandon Casey1-1/+1
2010-08-12index-pack: Don't follow replace refs.Nelson Elhage2-0/+8
2010-08-11post-receive-email: remove spurious commas in email subjectMatthieu Moy1-1/+1
2010-08-11fast-import: export correctly marks larger than 2^20-1Raja R Harinath2-1/+58
2010-08-11t/lib-git-svn.sh: use $PERL_PATH for perl, not perl from $PATHÆvar Arnfjörð Bjarmason1-3/+2
2010-08-11diff: strip extra "/" when stripping prefixJakub Narebski2-2/+69
2010-08-09gitweb: clarify search results page when no matching commit foundJonathan Nieder1-4/+5
2010-08-09Documentation: add a FILES section for show-refJonathan Nieder1-1/+7
2010-08-09Makefile: add missing dependency on http.hJonathan Nieder1-1/+1
2010-08-09Makefile: add missing dependencies on url.hJonathan Nieder1-0/+1
2010-08-09Documentation/git-log: Clarify --full-diffMichael J Gruber1-0/+3
2010-08-09git-rebase: fix typo when parsing --force-rebaseWilly Tarreau1-1/+1
2010-08-09imap-send: Fix sprintf usageÆvar Arnfjörð Bjarmason1-4/+8
2010-08-09prune: allow --dry-run for -n and --verbose for -vRené Scharfe2-3/+4
2010-08-09notes: allow --dry-run for -n and --verbose for -vRené Scharfe2-2/+5
2010-08-09Document -B<n>[/<m>], -M<n> and -C<n> variants of -B, -M and -CMatthieu Moy2-6/+31
2010-08-09Documentation: cite git-am from git-applyBrad King1-0/+10
2010-08-09t7003: fix subdirectory-filter testThomas Rast1-1/+2
2010-08-06smart-http: Don't deadlock on server failureShawn O. Pearce1-2/+3
2010-08-06Allow "check-ref-format --branch" from subdirectoryJonathan Nieder2-0/+19
2010-08-06check-ref-format: handle subcommands in separate functionsJonathan Nieder1-17/+25
2010-08-05pretty-options.txt: match --format's documentation with implementation.Matthieu Moy1-1/+1
2010-08-03Merge branch 'sv/maint-diff-q-clear-fix' into maintJunio C Hamano1-1/+0
2010-08-03Merge branch 'rr/svn-fe' into maintJunio C Hamano3-2/+3
2010-08-03Merge branch 'pt/git-gui' into maintJunio C Hamano9-33/+112
2010-08-03contrib/svn-fe: Add the svn-fe target to .gitignoreRamkumar Ramachandra1-0/+1
2010-08-03contrib/svn-fe: Fix IncludePathRamkumar Ramachandra2-2/+2
2010-08-02sha1_name.c: fix parsing of ":/token" syntaxJunio C Hamano1-10/+11
2010-08-02Merge branch 'ab/tap' into maintJunio C Hamano1-4/+3
2010-08-02test-lib: Remove 3 year old no-op --no-python optionÆvar Arnfjörð Bjarmason1-3/+0
2010-08-02test-lib: Ignore --quiet under a TAP harnessÆvar Arnfjörð Bjarmason1-1/+3
2010-08-02Merge git://repo.or.cz/git-gui into pt/git-guiJunio C Hamano9-33/+112
2010-08-02Documentation/rev-parse: quoting is required with --parseoptThomas Rast1-2/+5
2010-08-02Documentation: reporting bugsJunio C Hamano1-0/+7
2010-08-02Fix DIFF_QUEUE_CLEAR refactoringJunio C Hamano1-1/+0
2010-08-02git-gui: fix size and position of window panes on startupPat Thoyts1-18/+37
2010-08-02git-gui: mc cannot be used before msgcat has been loadedPat Thoyts1-1/+1
2010-07-30git-gui: use textconv filter for diff and blameClément Poulain4-4/+51
2010-07-30git-gui: Avoid using the <<Copy>> binding as a menu accelerator on win32Pat Thoyts1-3/+8
2010-07-30git-gui: fix shortcut creation on cygwinHeiko Voigt1-2/+2
2010-07-30git-gui: fix PATH environment for mingw development environmentHeiko Voigt1-2/+3
2010-07-30git-gui: fix usage of _gitworktree when creating shortcut for windowsHeiko Voigt1-2/+2
2010-07-30git-gui: fix "Explore Working Copy" for Windows againMarkus Heidelberg1-1/+1
2010-07-28xsize_t: check whether we lose bitsThomas Rast1-0/+2
2010-07-28Fix git rebase --continue to work with touched filesDavid D. Kilzer2-0/+44
2010-07-28Document ls-files -t as semi-obsolete.Matthieu Moy1-2/+10
2010-07-27Git 1.7.2.1v1.7.2.1Junio C Hamano4-3/+29
2010-07-27Sync with 1.7.1.2Junio C Hamano5-3/+54
2010-07-27Git 1.7.1.2v1.7.1.2Junio C Hamano3-2/+13
2010-07-27Sync with 1.7.0 seriesJunio C Hamano4-2/+44
2010-07-27Git 1.7.0.7v1.7.0.7Junio C Hamano4-3/+20
2010-07-27config --get --path: check for unset $HOMEJonathan Nieder2-1/+25
2010-07-27commit: remove full stop from usage help for -uStephen Boyd1-1/+1
2010-07-27Clarify help message when no remote is specified in fetch/pull.Matthieu Moy1-1/+2
2010-07-27Makefile: add check-docs exception for gitrevisionsThomas Rast1-0/+1
2010-07-27Fix 'git' wrapper usage stringThomas Rast1-2/+2
2010-07-25Documentation/git-push: Explain status output in more detailThomas Rast1-10/+23
2010-07-25Document receive.denyDeleteCurrentThomas Rast1-0/+4
2010-07-25Cast execl*() NULL sentinels to (char *)Thomas Rast1-6/+6
2010-07-25git-read-tree.txt: acknowledge the directory matching bug in sparse checkoutNguyễn Thái Ngọc Duy1-0/+7
2010-07-25INSTALL: configure /etc/xml/catalog to build docs on CygwinJon Seymour1-0/+33
2010-07-25t3700-add: fix dependence on stdout and stderr bufferingJohannes Sixt1-3/+6
2010-07-25git-rebase--interactive.sh: use printf instead of echo to print commit messageBrandon Casey2-7/+13
2010-07-25Add a google-chrome option for web--browseNathan W. Panike1-3/+3
2010-07-25Merge branch 'maint-1.7.1' into maintJunio C Hamano1-1/+4
2010-07-25Merge branch 'maint-1.7.0' into maint-1.7.1Junio C Hamano1-1/+4
2010-07-25Merge branch 'maint-1.6.6' into maint-1.7.0Junio C Hamano4-3/+26
2010-07-25Merge branch 'maint-1.6.5' into maint-1.6.6Junio C Hamano4-3/+26
2010-07-25request-pull.txt: Document -p optionStephen Boyd1-1/+4
2010-07-25Merge branch 'maint-1.6.4' into maint-1.6.5Junio C Hamano3-2/+22
2010-07-25Check size of path buffer before writing into itGreg Brockman1-0/+2
2010-07-23git-instaweb: Don't assume Apache executable is named apache2Dan McGee1-5/+14
2010-07-23git-instaweb: Fix Apache environment variable passingDan McGee1-2/+5
2010-07-23git-instaweb: Fix custom apache log placementDan McGee1-1/+1
2010-07-21Git 1.7.2v1.7.2Junio C Hamano3-9/+10
2010-07-21tests: correct "does reflog exist?" testsJunio C Hamano2-49/+11
2010-07-21t/: work around one-shot variable assignment with test_must_failBrandon Casey3-8/+40
2010-07-21t/README: correct an exception when breaking a && chain in testsJonathan Nieder1-4/+4
2010-07-20t/{t5541,lib-httpd}: replace problematic '!()' notation with test_must_failBrandon Casey2-2/+2
2010-07-20t/t3700: convert two uses of negation operator '!' to use test_must_failBrandon Casey1-2/+2
2010-07-20Merge branch 'maint'Junio C Hamano2-2/+6
2010-07-20t/README: clarify test_must_fail descriptionBrandon Casey1-0/+8
2010-07-20Check size of path buffer before writing into itGreg Brockman1-0/+2
2010-07-19Merge branch 'maint'Junio C Hamano2-3/+10
2010-07-19update-server-info: Shorten read_pack_info_file()Ralf Thielow1-3/+0
2010-07-19git add: Add --ignore-missing to SYNOPSISÆvar Arnfjörð Bjarmason1-1/+2
2010-07-19git submodule add: Remove old docs about implicit -fÆvar Arnfjörð Bjarmason1-4/+0
2010-07-19git submodule add: Require the new --force option to add ignored pathsJens Lehmann3-15/+35
2010-07-19Merge branch 'jl/add-n-ignore-missing'Junio C Hamano5-6/+47
2010-07-19Documentation: Explain git-mergetool's use of temporary filesDavid Aguilar1-0/+10
2010-07-19git-svn: write memoized data explicitly to avoid Storable bugSergey Vlasov1-0/+16
2010-07-16Merge branch 'jc/diff-merge-base-multi'Junio C Hamano1-13/+0
2010-07-16Only run aggregate-results over actual countsThomas Rast2-2/+2
2010-07-16Add a sample user for the svndump libraryJonathan Nieder4-0/+147
2010-07-16diff A...B: do not limit the syntax too narrowlyJunio C Hamano1-13/+0
2010-07-15Merge branch 'jn/paginate-fix'Junio C Hamano2-46/+200
2010-07-15Merge branch 'wp/merge-tree-fix'Junio C Hamano2-1/+259
2010-07-15Merge branch 'js/merge-rr-fix'Junio C Hamano2-3/+3
2010-07-15Merge branch 'jc/diff-merge-base-multi'Junio C Hamano1-8/+23
2010-07-15Merge branch 'ns/merge-recursive-uptodate'Junio C Hamano1-1/+1
2010-07-15Merge branch 'jn/tests'Junio C Hamano1-47/+42
2010-07-15Merge branch 'eb/doc-log-manpage'Junio C Hamano1-6/+9
2010-07-15Merge branch 'jn/grep-open'Junio C Hamano2-0/+16
2010-07-15Merge branch 'mg/revision-doc'Junio C Hamano20-222/+257
2010-07-15Merge branch 'jk/maint-status-keep-index-timestamp'Junio C Hamano1-5/+11
2010-07-15Merge branch 'jc/rebase-i-commit-msg-fix'Junio C Hamano2-9/+28
2010-07-15Merge branch 'ab/submodule-add-f'Junio C Hamano3-3/+29
2010-07-15Merge branch 'bc/maint-makefile-fixes'Junio C Hamano1-5/+5
2010-07-15Merge branch 'maint'Junio C Hamano3-2/+13
2010-07-15Documentation: add submodule.* to the big configuration variable listJonathan Nieder1-0/+9
2010-07-15gitmodules.5: url can be a relative pathJonathan Nieder1-0/+3
2010-07-15gitweb: fix esc_urlPavan Kumar Sunkara1-2/+1
2010-07-14git --paginate: paginate external commands againJonathan Nieder2-12/+38
2010-07-14MERGE_RR is in .git, not .git/rr-cacheJay Soffian2-3/+3
2010-07-14merge-tree: fix where two branches share no changesWill Palmer2-4/+5
2010-07-14add basic tests for merge-treeWill Palmer1-0/+257
2010-07-14Git 1.7.2-rc3v1.7.2-rc3Junio C Hamano1-1/+4
2010-07-14Merge branch 'jc/read-tree-cache-tree-fix'Junio C Hamano2-5/+16
2010-07-14Use dev_t for device id (st_dev) from stat in setup_git_directory_gently()Raja R Harinath1-1/+2
2010-07-13diff A...B: give one possible diff when there are more than one merge-baseJunio C Hamano1-8/+23
2010-07-13Merge branch 'maint'Junio C Hamano2-2/+5
2010-07-13git fetch documentation: describe short '-p' synonym to '--prune' optionOren Held1-0/+1
2010-07-13format-patch: document the format.to configuration settingMiklos Vajna1-2/+4
2010-07-12git add: Add the "--ignore-missing" option for the dry runJens Lehmann5-6/+47
2010-07-12test-lib: TAP compliance for skipping tests on requestMichael J Gruber1-2/+2
2010-07-12test-lib: simplify GIT_SKIP_TESTS loopMichael J Gruber1-10/+3
2010-07-11Merge branch 'maint'Junio C Hamano3-2/+3
2010-07-11t3000 (ls-files -o): modernize styleJonathan Nieder1-47/+42
2010-07-10git-gui: fix usage of themed widgets variableHeiko Voigt1-0/+1
2010-07-10git-gui: Handle failure of core.worktree to identify the working directory.Pat Thoyts1-0/+3
2010-07-09Documentation: Spelling fix in protocol-capabilities.txtFredrik Skolmli1-1/+1
2010-07-09merge-recursive: use "up-to-date" instead of "uptodate" in error message for ...Nicolas Sebrecht1-1/+1
2010-07-09checkout: accord documentation to what git doesNicolas Sebrecht1-1/+1
2010-07-09t0005: work around strange $? in ksh when program terminated by a signalJohannes Sixt1-0/+1
2010-07-08Merge remote branch 'ko/master' into jc/read-tree-cache-tree-fixJunio C Hamano997-17105/+82957
2010-07-08diff.c: fix a graph output bugBo Yang1-2/+1
2010-07-08tests: Use skip_all=* to skip testsÆvar Arnfjörð Bjarmason7-18/+17
2010-07-08Fix "read-tree -m A B" priming the cache-treeJunio C Hamano2-5/+16
2010-07-08Reorganize `git-log' man page to clarify common diff options.Eli Barzilay1-6/+9
2010-07-08t9118 (git-svn): prevent early failure from taking down later testsJonathan Nieder1-21/+25
2010-07-08t9118: avoid PEG revision identifier in testsMichael J Gruber1-1/+1
2010-07-07grep -O: Do not pass color sequences as filenames to pagerNazri Ramliy2-0/+16
2010-07-07Git 1.7.2-rc2v1.7.2-rc2Junio C Hamano1-14/+4
2010-07-07Merge branch 'ab/tap'Junio C Hamano46-111/+369
2010-07-07Merge branch 'maint'Junio C Hamano4-8/+54
2010-07-07backmerge a few more fixes to 1.7.1.X seriesJunio C Hamano2-1/+20
2010-07-07Merge branch 'maint-1.6.4' into maintJunio C Hamano2-2/+20
2010-07-07rev-parse: fix --parse-opt --keep-dashdash --stop-at-non-optionUwe Kleine-König2-2/+20
2010-07-07Merge branch 'mg/doc-rev-parse-treepath-syntax' into maintJunio C Hamano1-6/+9
2010-07-07Merge branch 'tr/receive-pack-aliased-update-fix' into maintJunio C Hamano2-37/+140
2010-07-07fix git branch -m in presence of cross devicesPierre Habouzit1-6/+15
2010-07-07t/t0006: specify timezone as EST5 not EST to comply with POSIXBrandon Casey1-1/+1
2010-07-06do not write out index when status does not have toJunio C Hamano1-5/+11
2010-07-06Merge branch 'maint'Junio C Hamano2-3/+3
2010-07-06add missing && to submodule-merge testcaseHeiko Voigt1-1/+1
2010-07-06t/README: document more test helpersJonathan Nieder1-0/+31
2010-07-06Makefile: work around ksh's failure to handle missing list argument to for loopBrandon Casey1-3/+3
2010-07-06test-date: fix sscanf type conversionJeff King1-2/+2
2010-07-05Merge branch 'maint'Junio C Hamano1-1/+3
2010-07-05xdiff: optimise for no whitespace difference when ignoring whitespace.Dylan Reid1-1/+3
2010-07-05rebase-i: do not get fooled by a log message ending with backslashJunio C Hamano2-5/+23
2010-07-05rebase-i: style fixJunio C Hamano1-5/+6
2010-07-05Documentation: link to gitrevisions rather than git-rev-parseMichael J Gruber16-22/+21
2010-07-05Documentation: gitrevisionsMichael J Gruber2-1/+36
2010-07-05Documentation: split off rev doc into include fileMichael J Gruber2-199/+200
2010-07-05gitweb: Move evaluate_gitweb_config out of run_requestJakub Narebski1-6/+11
2010-07-05parse_date: fix signedness in timezone calculationJeff King2-1/+2
2010-07-05Merge branch 'maint'Junio C Hamano4-6/+22
2010-07-05t0006: test timezone parsingJeff King2-5/+9
2010-07-05git submodule: add submodules with git add -f <path>Ævar Arnfjörð Bjarmason3-3/+29
2010-07-05rerere.txt: Document forget subcommandMichael J Gruber1-1/+6
2010-07-05t/README: proposed rewording...Junio C Hamano1-13/+8
2010-07-05t/README: Document the do's and don'ts of testsÆvar Arnfjörð Bjarmason1-0/+78
2010-07-05t/README: Add a section about skipping testsÆvar Arnfjörð Bjarmason1-0/+12
2010-07-05t/README: Document test_expect_codeÆvar Arnfjörð Bjarmason1-0/+7
2010-07-05t/README: Document test_external*Ævar Arnfjörð Bjarmason1-0/+27
2010-07-05t/README: Document the prereq functions, and 3-arg test_*Ævar Arnfjörð Bjarmason1-3/+34
2010-07-05t/README: Typo: paralell -> parallelÆvar Arnfjörð Bjarmason1-1/+1
2010-07-05t/README: The trash is in 't/trash directory.$name'Ævar Arnfjörð Bjarmason1-3/+4
2010-07-05Makefile: remove some unnecessary curly bracesBrandon Casey1-4/+4
2010-07-02Documentation/git-gc.txt: add reference to githooksChris Packham1-0/+7
2010-07-02Updates from the list to 1.7.2 Release NotesJunio C Hamano1-12/+14
2010-06-30Git 1.7.2-rc1v1.7.2-rc1Junio C Hamano2-5/+12
2010-06-30git.spec.in: Add gitweb subpackageJunio C Hamano1-0/+15
2010-06-30Merge branch 'ar/decorate-color'Junio C Hamano6-8/+176
2010-06-30Merge branch 'mg/doc-rev-parse-treepath-syntax'Junio C Hamano1-6/+9
2010-06-30Merge branch 'cc/cherry-pick-stdin'Junio C Hamano4-25/+61
2010-06-30Merge branch 'jl/status-ignore-submodules'Junio C Hamano9-16/+177
2010-06-30Merge branch 'jk/url-decode'Junio C Hamano1-4/+4
2010-06-30Merge branch 'jn/grep-open'Junio C Hamano7-39/+276
2010-06-30Merge branch 'jp/string-list-api-cleanup'Junio C Hamano29-147/+147
2010-06-30Merge branch 'tr/rev-list-count'Junio C Hamano6-1/+204
2010-06-30Merge branch 'as/maint-completion-set-u-fix'Junio C Hamano1-7/+7
2010-06-30Merge branch 'mg/rev-parse-tests'Junio C Hamano1-1/+16