summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2011-05-01Merge branch 'rs/strbuf-setlen-assert'Libravatar Junio C Hamano1-5/+2
2011-05-01Merge branch 'vh/git-svn-doc'Libravatar Junio C Hamano1-11/+11
2011-05-01Pass empty file to p4merge where no base is suitable.Libravatar Ciaran Jessup1-6/+3
2011-05-01Look for password in both CVS and CVSNT password files.Libravatar Guy Rouillier1-12/+41
2011-04-29merge-one-file: fix broken merges with alternate work treesLibravatar Jeff King2-3/+8
2011-04-29add tests for merge-index / merge-one-fileLibravatar Jeff King1-0/+100
2011-04-29"add -p": work-around an old laziness that does not coalesce hunksLibravatar Junio C Hamano2-4/+7
2011-04-29add--interactive.perl: factor out repeated --recount optionLibravatar Junio C Hamano1-8/+8
2011-04-29t3701: Editing a split hunk in an "add -p" sessionLibravatar Junio C Hamano1-0/+36
2011-04-29add -p: 'q' should really quitLibravatar Junio C Hamano1-5/+4
2011-04-29gitweb: Mark matched 'ctag' / contents tag (?by_tag=foo)Libravatar Jakub Narebski1-3/+9
2011-04-29gitweb: Change the way "content tags" ('ctags') are handledLibravatar Jakub Narebski1-44/+97
2011-04-29gitweb: Restructure projects list generationLibravatar Jakub Narebski3-77/+296
2011-04-29Merge branch 'maint'Libravatar Junio C Hamano2-1/+15
2011-04-29Start 1.7.5.1 maintenance trackLibravatar Junio C Hamano2-1/+15
2011-04-29Merge branch 'mg/x-years-12-months' into maintLibravatar Junio C Hamano2-2/+4
2011-04-29git-send-email: fix missing space in error messageLibravatar Sylvain Rabot1-1/+1
2011-04-29Mark dirstat error messages for translationLibravatar Johan Herland2-15/+15
2011-04-29Improve error handling when parsing dirstat parametersLibravatar Johan Herland2-30/+78
2011-04-29New --dirstat=lines mode, doing dirstat analysis based on diffstatLibravatar Johan Herland5-2/+176
2011-04-29Allow specifying --dirstat cut-off percentage as a floating point numberLibravatar Johan Herland3-11/+81
2011-04-29Add config variable for specifying default --dirstat behaviorLibravatar Johan Herland4-1/+119
2011-04-29Refactor --dirstat parsing; deprecate --cumulative and --dirstat-by-fileLibravatar Johan Herland3-22/+214
2011-04-29Make --dirstat=0 output directories that contribute < 0.1% of changesLibravatar Johan Herland2-4/+4
2011-04-29Add several testcases for --dirstat and friendsLibravatar Johan Herland1-0/+585
2011-04-29blame: tolerate bogus e-mail addresses a bit betterLibravatar Josh Stone3-3/+13
2011-04-29t/test-lib.sh: minor readability improvementsLibravatar Mathias Lafeldt1-7/+9
2011-04-29diffcore-rename.c: avoid set-but-not-used warningLibravatar Jim Meyering1-2/+1
2011-04-28Merge branch 'jc/diff-irreversible-delete'Libravatar Junio C Hamano4-6/+70
2011-04-28Merge branch 'jc/rename-degrade-cc-to-c'Libravatar Junio C Hamano8-40/+152
2011-04-28Merge branch 'mz/rebase'Libravatar Junio C Hamano14-868/+844
2011-04-28Merge branch 'en/merge-recursive'Libravatar Junio C Hamano2-6/+81
2011-04-28Merge branch 'jh/dirstat'Libravatar Junio C Hamano8-12/+81
2011-04-28Merge branch 'sp/maint-clear-postfields'Libravatar Junio C Hamano1-0/+1
2011-04-28Honor $(prefix) set in config.mak* when defining ETC_GIT* and sysconfdirLibravatar Kacper Kornet1-9/+10
2011-04-28hashcmp(): inline memcmp() by hand to optimizeLibravatar Ingo Molnar1-4/+14
2011-04-28git-rebase--interactive.sh: preserve-merges fails on merges created with no-ffLibravatar Andrew Wong2-2/+32
2011-04-28completion: don't declare 'local words' to make zsh happyLibravatar SZEDER Gábor1-2/+6
2011-04-28completion: remove unnecessary _get_comp_words_by_ref() invocationsLibravatar SZEDER Gábor1-105/+11
2011-04-28completion: don't modify the $cur variable in completion functionsLibravatar SZEDER Gábor1-57/+50
2011-04-27Start 1.7.6 cycleLibravatar Junio C Hamano3-2/+81
2011-04-27Merge branch 'mg/x-years-12-months'Libravatar Junio C Hamano2-2/+4
2011-04-27Merge branch 'cn/format-patch-quiet'Libravatar Junio C Hamano2-7/+14
2011-04-27Merge branch 'ef/maint-strbuf-init'Libravatar Junio C Hamano3-12/+12
2011-04-27Merge branch 'rr/doc-content-type'Libravatar Junio C Hamano2-62/+103
2011-04-27Merge branch 'jc/merge-dash-previous'Libravatar Junio C Hamano1-3/+6
2011-04-27Merge branch 'dm/stash-k-i-p'Libravatar Junio C Hamano3-4/+25
2011-04-27Merge branch 'rj/sparse'Libravatar Junio C Hamano10-30/+50
2011-04-27Merge branch 'jk/maint-upload-pack-shallow'Libravatar Junio C Hamano1-12/+11
2011-04-27Merge branch 'nk/blame-abbrev'Libravatar Junio C Hamano2-2/+14