summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2011-05-13Merge branch 'jk/merge-one-file-working-tree' into maintLibravatar Junio C Hamano2-1/+106
2011-05-13Merge branch 'jc/fix-diff-files-unmerged' into maintLibravatar Junio C Hamano16-36/+120
2011-05-13Merge branch 'mz/maint-rename-unmerged' into maintLibravatar Junio C Hamano2-2/+67
2011-05-13t5400: Fix a couple of typosLibravatar Johan Herland1-2/+2
2011-05-05Remove duplicated "is a"Libravatar João Britto1-1/+1
2011-05-05t3701: fix here documentLibravatar Junio C Hamano1-3/+2
2011-05-05git-fast-import.txt: --relative-marks takes no parameterLibravatar Michael J Gruber1-2/+2
2011-05-05shell: add missing initialization of argv0_pathLibravatar Dima Sharov1-0/+2
2011-05-04Git 1.7.5.1Libravatar Junio C Hamano3-2/+36
2011-05-04Merge branch 'jh/dirstat' into maintLibravatar Junio C Hamano8-12/+81
2011-05-04Merge branch 'sp/maint-clear-postfields' into maintLibravatar Junio C Hamano1-0/+1
2011-05-04Merge branch 'jk/maint-stash-oob' into maintLibravatar Junio C Hamano2-16/+12
2011-05-04Merge branch 'jk/maint-upload-pack-shallow' into maintLibravatar Junio C Hamano1-12/+11
2011-05-04Merge branch 'dm/stash-k-i-p' into maintLibravatar Junio C Hamano3-4/+25
2011-05-04Merge branch 'jc/pack-objects-bigfile' into maintLibravatar Junio C Hamano6-9/+14
2011-05-04Merge branch 'mg/reflog-with-options' into maintLibravatar Junio C Hamano2-13/+35
2011-05-04Merge branch 'jk/stash-loosen-safety' into maintLibravatar Junio C Hamano2-7/+17
2011-05-04Merge branch 'ar/clean-rmdir-empty' into maintLibravatar Junio C Hamano2-1/+8
2011-05-04Merge branch 'mg/sha1-path-advise' into maintLibravatar Junio C Hamano2-9/+19
2011-05-04git-add.txt: document 'add.ignoreErrors'Libravatar Valentin Haenel1-0/+2
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-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-26http: clear POSTFIELDS when initializing a slotLibravatar Junio C Hamano1-0/+1
2011-04-23Git 1.7.5Libravatar Junio C Hamano2-1/+6
2011-04-23diff-files: show unmerged entries correctlyLibravatar Junio C Hamano2-2/+95
2011-04-23diff: remove often unused parameters from diff_unmerge()Libravatar Junio C Hamano3-11/+6
2011-04-23diff.c: return filepair from diff_unmerge()Libravatar Junio C Hamano2-6/+9
2011-04-23test: use $_z40 from test-libLibravatar Junio C Hamano12-22/+15
2011-04-20date: avoid "X years, 12 months" in relative datesLibravatar Michael J Gruber2-2/+4
2011-04-19Git 1.7.5-rc3Libravatar Junio C Hamano3-9/+4
2011-04-19Sync with 1.7.4.5Libravatar Junio C Hamano2-0/+11
2011-04-19Git 1.7.4.5Libravatar Junio C Hamano3-2/+6
2011-04-19git-svn.txt: Document --mergeinfoLibravatar Michael J Gruber1-0/+7
2011-04-18Revert "run-command: prettify -D_FORTIFY_SOURCE workaround"Libravatar Junio C Hamano1-11/+6
2011-04-14Merge branch 'maint'Libravatar Junio C Hamano4-3/+7
2011-04-14archive: document limitation of tar.umask config settingLibravatar René Scharfe1-1/+2
2011-04-14t3306,t5304: avoid clock skew issuesLibravatar Michael J Gruber2-1/+5
2011-04-14git.txt: fix list continuationLibravatar Michael J Gruber1-1/+0
2011-04-13Git 1.7.5-rc2Libravatar Junio C Hamano2-3/+3
2011-04-13Merge branch 'maint'Libravatar Junio C Hamano0-0/+0
2011-04-13Merge branch 'jc/rev-list-options-fix' into maintLibravatar Junio C Hamano1-2/+2
2011-04-13Merge branch 'js/checkout-untracked-symlink' into maintLibravatar Junio C Hamano1-1/+1
2011-04-13remove doubled words, e.g., s/to to/to/, and fix related typosLibravatar Jim Meyering8-14/+11
2011-04-13revert: Hide '-r' option in default usageLibravatar Ramkumar Ramachandra1-1/+2
2011-04-12--dirstat: In case of renames, use target filename instead of source filenameLibravatar Johan Herland1-1/+1
2011-04-12Merge branch 'js/checkout-untracked-symlink'Libravatar Junio C Hamano1-1/+1
2011-04-12Merge branch 'nd/init-gitdir'Libravatar Junio C Hamano1-1/+1