summaryrefslogtreecommitdiffstats
path: root/t/t5536-fetch-conflicts.sh (unfollow)
Commit message (Expand)AuthorFilesLines
2017-01-18Almost ready for 2.11.1Junio C Hamano4-3/+124
2017-01-11t7810: avoid assumption about invalid regex syntaxJeff King1-11/+15
2017-01-08blame: output porcelain "previous" header for each fileJeff King2-9/+131
2017-01-08blame: handle --no-abbrevJeff King2-0/+6
2017-01-08blame: fix alignment with --abbrev=40Jeff King2-1/+29
2017-01-08rebase--interactive: count squash commits above 10 correctlyJeff King1-1/+1
2017-01-08branch_get_push: do not segfault when HEAD is detachedKyle Meyer2-3/+9
2017-01-08archive-zip: load userdiff configJeff King2-4/+25
2016-12-29repack: die on incremental + write-bitmap-indexDavid Turner2-5/+12
2016-12-29auto gc: don't write bitmaps for incremental repacksDavid Turner2-1/+33
2016-12-22config.abbrev: document the new default that auto-scalesJunio C Hamano2-8/+15
2016-12-22config.c: handle lock file in error case in git_config_rename_...Nguyễn Thái Ngọc Duy1-1/+3
2016-12-22mingw: replace isatty() hackJeff Hostetler1-107/+69
2016-12-22mingw: fix colourization on Cygwin pseudo terminalsAlan Davies1-2/+6
2016-12-22mingw: adjust is_console() to work with stdinJohannes Schindelin1-1/+5
2016-12-21t5615-alternate-env: double-quotes in file names do not work on WindowsJohannes Sixt1-1/+1
2016-12-20fast-import: properly fanout notes when tree is importedMike Hommey2-3/+47
2016-12-20config.c: rename label unlock_and_outNguyễn Thái Ngọc Duy1-2/+2
2016-12-20config.c: handle error case for fstat() callsNguyễn Thái Ngọc Duy1-2/+10
2016-12-20mailinfo.c: move side-effects outside of assertKyle J. McKay1-1/+2
2016-12-20mingw: consider that UNICODE_STRING::Length counts bytesMax Kirillov1-1/+1
2016-12-19git-p4: fix multi-path changelist empty commitsGeorge Vanburgh2-3/+23
2016-12-18git-p4: avoid crash adding symlinked directoryLuke Diamand2-6/+63
2016-12-18t0021: fix flaky testLars Schneider1-16/+1
2016-12-16index-pack: skip collision check when not in repositoryJeff King1-4/+6
2016-12-16normalize_path_copy(): fix pushing to //server/share/dir on WindowsJohannes Sixt1-9/+14
2016-12-16t: use nongit() function where applicableJeff King3-29/+5
2016-12-16index-pack: complain when --stdin is used outside of a repoJeff King2-0/+17
2016-12-16t5000: extract nongit function to test-lib-functions.shJeff King2-14/+14
2016-12-15README: replace gmane link with public-inboxJeff King1-1/+1
2016-12-14Revert "sequencer: remove useless get_dir() function"Junio C Hamano1-1/+6
2016-12-14parse-options: print "fatal:" before usage_msg_opt()Jeff King1-1/+1
2016-12-14Makefile: exclude contrib from FIND_SOURCE_FILESJeff King1-0/+2
2016-12-14Makefile: match shell scripts in FIND_SOURCE_FILESJeff King1-1/+3
2016-12-14Makefile: exclude test cruft from FIND_SOURCE_FILESJeff King1-1/+7
2016-12-14Makefile: reformat FIND_SOURCE_FILESJeff King1-3/+6
2016-12-14unicode_width.h: update the width tables to Unicode 9.0Beat Bolli1-24/+107
2016-12-14update_unicode.sh: remove the plane filterBeat Bolli1-2/+1
2016-12-14update_unicode.sh: automatically download newer definition filesBeat Bolli1-6/+2
2016-12-14update_unicode.sh: pin the uniset repo to a known good commitBeat Bolli1-1/+2
2016-12-14update_unicode.sh: remove an unnecessary subshell levelBeat Bolli1-27/+26
2016-12-14update_unicode.sh: move it into contrib/update-unicodeBeat Bolli4-6/+26
2016-12-13t5547-push-quarantine: run the path separator test on Windows, tooJohannes Sixt1-4/+10
2016-12-13t3600: slightly modernize styleStefan Beller1-73/+51
2016-12-13tmp-objdir: quote paths we add to alternatesJeff King2-1/+36
2016-12-13alternates: accept double-quoted pathsJeff King3-11/+60
2016-12-12date-formats.txt: Typo fixLuis Ressel1-1/+1
2016-12-12git-svn: document useLogAuthor and addAuthorFrom config keysEric Wong1-1/+7
2016-12-12git-svn: allow "0" in SVN path componentsEric Wong1-1/+1
2016-12-12mergetools: fix xxdiff hotkeysDavid Aguilar1-5/+5