summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2011-05-02Merge branch 'jh/notes-add-ui'Libravatar Junio C Hamano3-7/+49
2011-05-02Merge branch 'nd/maint-setup'Libravatar Junio C Hamano3-45/+34
2011-05-02Merge branch 'mz/maint-rename-unmerged'Libravatar Junio C Hamano2-2/+67
2011-05-02Documentation: clarify meaning of --html-path, --man-path, and --info-pathLibravatar Jonathan Nieder1-6/+6
2011-05-01git: add --info-path and --man-path optionsLibravatar Jon Seymour3-3/+19
2011-05-01Update draft release notes to 1.7.6Libravatar Junio C Hamano1-2/+7
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-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-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-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: 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
2011-04-27Merge branch 'jk/maint-stash-oob'Libravatar Junio C Hamano2-16/+12
2011-04-27Merge branch 'dm/color-palette'Libravatar Junio C Hamano4-35/+29
2011-04-27Merge branch 'jk/stash-loosen-safety'Libravatar Junio C Hamano2-7/+17
2011-04-27Merge branch 'jc/pack-objects-bigfile'Libravatar Junio C Hamano6-9/+14
2011-04-27Merge branch 'mh/git-svn-automkdirs'Libravatar Junio C Hamano3-2/+42
2011-04-27Merge branch 'mg/reflog-with-options'Libravatar Junio C Hamano2-13/+35
2011-04-27Merge branch 'ar/clean-rmdir-empty'Libravatar Junio C Hamano2-1/+8
2011-04-27Merge branch 'mg/sha1-path-advise'Libravatar Junio C Hamano2-9/+19
2011-04-27config.txt,diff-options.txt: porcelain vs. plumbing for color.diffLibravatar Michael J Gruber2-12/+30
2011-04-27strbuf: clarify assertion in strbuf_setlen()Libravatar René Scharfe1-5/+2
2011-04-27handle_alias: provide GIT_PREFIX to !aliasLibravatar Michael J Gruber3-1/+21