summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* merge script: notice @{-1} shorthandJonathan Nieder2010-08-181-2/+4
* merge script: handle --no-ff --no-commit correctlyJonathan Nieder2010-08-181-2/+10
* merge script: --ff-only to disallow true mergeJonathan Nieder2010-08-181-2/+15
* merge script: handle many-way octopusJonathan Nieder2010-08-181-3/+3
* merge script: handle -m --log correctlyJonathan Nieder2010-08-181-4/+10
* merge script: forbid merge -s indexJonathan Nieder2010-08-181-0/+5
* merge script: allow custom strategiesJonathan Nieder2010-08-181-2/+6
* merge script: merge -X<option>Jonathan Nieder2010-08-181-1/+7
* merge script: improve log message subjectJonathan Nieder2010-08-181-8/+19
* merge script: refuse to merge during mergeJonathan Nieder2010-08-181-0/+3
* merge script: tweak unmerged files message to match builtinJonathan Nieder2010-08-181-1/+1
* merge script: --squash, --ff from unborn branch are errorsJonathan Nieder2010-08-181-0/+4
* fmt-merge-msg -m to override merge titleJonathan Nieder2010-08-183-4/+55
* merge-base --independent to print reduced parent list in a mergeJonathan Nieder2010-08-183-7/+62
* merge-base --octopus to mimic show-branch --merge-baseJonathan Nieder2010-08-183-10/+46
* Documentation: add a SEE ALSO section for merge-baseJonathan Nieder2010-08-181-0/+6
* t6200 (fmt-merge-msg): style nitpicksJonathan Nieder2010-08-181-160/+120
* t6010 (merge-base): modernize styleJonathan Nieder2010-08-181-143/+160
* t7600 (merge): test merge from branch yet to be bornJonathan Nieder2010-08-181-0/+21
* t7600 (merge): check reflog entryJonathan Nieder2010-08-181-1/+7
* t7600 (merge): do not launch gitk for --debugJonathan Nieder2010-08-181-29/+29
* t7600 (merge): modernize styleJonathan Nieder2010-08-181-187/+101
* merge: do not mistake (ancestor of) tag for branchJonathan Nieder2010-08-182-5/+13
* Git 1.7.2v1.7.2Junio C Hamano2010-07-213-9/+10
* tests: correct "does reflog exist?" testsJunio C Hamano2010-07-212-49/+11
* t/: work around one-shot variable assignment with test_must_failBrandon Casey2010-07-213-8/+40
* t/README: correct an exception when breaking a && chain in testsJonathan Nieder2010-07-211-4/+4
* t/{t5541,lib-httpd}: replace problematic '!()' notation with test_must_failBrandon Casey2010-07-202-2/+2
* t/t3700: convert two uses of negation operator '!' to use test_must_failBrandon Casey2010-07-201-2/+2
* Merge branch 'maint'Junio C Hamano2010-07-202-2/+6
|\
| * t/README: clarify test_must_fail descriptionBrandon Casey2010-07-201-0/+8
| * Check size of path buffer before writing into itGreg Brockman2010-07-201-0/+2
* | Merge branch 'maint'Junio C Hamano2010-07-192-3/+10
|\ \ | |/
| * update-server-info: Shorten read_pack_info_file()Ralf Thielow2010-07-191-3/+0
| * Documentation: Explain git-mergetool's use of temporary filesDavid Aguilar2010-07-191-0/+10
* | git add: Add --ignore-missing to SYNOPSISÆvar Arnfjörð Bjarmason2010-07-191-1/+2
* | git submodule add: Remove old docs about implicit -fÆvar Arnfjörð Bjarmason2010-07-191-4/+0
* | git submodule add: Require the new --force option to add ignored pathsJens Lehmann2010-07-193-15/+35
* | Merge branch 'jl/add-n-ignore-missing'Junio C Hamano2010-07-195-6/+47
|\ \
| * | git add: Add the "--ignore-missing" option for the dry runJens Lehmann2010-07-125-6/+47
* | | git-svn: write memoized data explicitly to avoid Storable bugSergey Vlasov2010-07-191-0/+16
* | | Merge branch 'jc/diff-merge-base-multi'Junio C Hamano2010-07-161-13/+0
|\ \ \
| * | | diff A...B: do not limit the syntax too narrowlyJunio C Hamano2010-07-161-13/+0
* | | | Only run aggregate-results over actual countsThomas Rast2010-07-162-2/+2
* | | | Add a sample user for the svndump libraryJonathan Nieder2010-07-164-0/+147
* | | | Merge branch 'jn/paginate-fix'Junio C Hamano2010-07-152-46/+200
|\ \ \ \
| * | | | git --paginate: paginate external commands againJonathan Nieder2010-07-142-12/+38
| * | | | git --paginate: do not commit pager choice too earlyNguyễn Thái Ngọc Duy2010-06-282-13/+47
| * | | | tests: local config file should be honored from subdirs of toplevelJonathan Nieder2010-06-281-0/+26
| * | | | t7006: test pager configuration for several git commandsJonathan Nieder2010-06-281-52/+84
View Lorry Controller Status