summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jn/parse-config-slot'Junio C Hamano2014-10-2013-50/+47
|\
| * color_parse: do not mention variable name in error messagejn/parse-config-slotJeff King2014-10-1411-28/+26
| * pass config slots as pointers instead of offsetsJonathan Nieder2014-10-145-22/+21
* | Merge branch 'rs/receive-pack-argv-leak-fix'Junio C Hamano2014-10-201-10/+8
|\ \
| * | receive-pack: plug minor memory leak in unpack()rs/receive-pack-argv-leak-fixRené Scharfe2014-10-131-10/+8
* | | Merge branch 'ta/config-set'Junio C Hamano2014-10-201-2/+2
|\ \ \
| * | | t1308: fix broken here document in test scriptta/config-setJunio C Hamano2014-10-131-2/+2
* | | | Merge branch 'jk/test-shell-trace'Junio C Hamano2014-10-204-35/+84
|\ \ \ \
| * | | | test-lib.sh: support -x option for shell-tracingjk/test-shell-traceJeff King2014-10-132-4/+44
| * | | | t5304: use helper to report failure of "test foo = bar"Jeff King2014-10-132-8/+17
| * | | | t5304: use test_path_is_* instead of "test -f"Jeff King2014-10-131-23/+23
* | | | | Merge branch 'bc/asciidoc'Junio C Hamano2014-10-204-5/+5
|\ \ \ \ \
| * | | | | Documentation: fix mismatched delimiters in git-imap-sendbc/asciidocbrian m. carlson2014-10-131-2/+2
| * | | | | Documentation: adjust document title underliningbrian m. carlson2014-10-133-3/+3
| |/ / / /
* | | | | Revert "archive: honor tar.umask even for pax headers"Junio C Hamano2014-10-202-7/+2
* | | | | Merge branch 'jc/completion-no-chdir'Junio C Hamano2014-10-161-11/+7
|\ \ \ \ \
| * | | | | completion: use "git -C $there" instead of (cd $there && git ...)jc/completion-no-chdirJunio C Hamano2014-10-091-11/+7
* | | | | | Merge branch 'bw/trace-no-inline-getnanotime'Junio C Hamano2014-10-161-1/+1
|\ \ \ \ \ \
| * | | | | | trace.c: do not mark getnanotime() as "inline"bw/trace-no-inline-getnanotimeBen Walton2014-09-291-1/+1
* | | | | | | Merge branch 'po/everyday-doc'Junio C Hamano2014-10-1612-131/+185
|\ \ \ \ \ \ \
| * | | | | | | doc: add 'everyday' to 'git help'Philip Oakley2014-10-1012-21/+32
| * | | | | | | doc: Makefile regularise OBSOLETE_HTML list buildingPhilip Oakley2014-10-101-1/+2
| * | | | | | | doc: modernise everyday.txt wording and format in man page stylePhilip Oakley2014-10-101-109/+151
* | | | | | | | Update draft release notes to 2.2Junio C Hamano2014-10-141-0/+21
* | | | | | | | Merge branch 'bc/asciidoc-pretty-formats-fix'Junio C Hamano2014-10-141-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Documentation: fix misrender of pretty-formats in Asciidoctorbc/asciidoc-pretty-formats-fixbrian m. carlson2014-10-081-1/+1
* | | | | | | | | Merge branch 'rs/plug-leak-in-bundle'Junio C Hamano2014-10-141-7/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | bundle: plug minor memory leak in is_tag_in_date_range()rs/plug-leak-in-bundleRené Scharfe2014-10-071-7/+10
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch 'rs/more-uses-of-skip-prefix'Junio C Hamano2014-10-1410-75/+69
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | use skip_prefix() to avoid more magic numbersrs/more-uses-of-skip-prefixRené Scharfe2014-10-0710-75/+69
* | | | | | | | | | Merge branch 'rs/mailsplit'Junio C Hamano2014-10-141-1/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | mailsplit: remove unnecessary unlink(2) callrs/mailsplitRené Scharfe2014-10-071-1/+0
* | | | | | | | | | | Merge branch 'rs/sha1-array-test'Junio C Hamano2014-10-145-2/+130
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | sha1-lookup: handle duplicates in sha1_pos()rs/sha1-array-testRené Scharfe2014-10-012-2/+20
| * | | | | | | | | | | sha1-array: add test-sha1-array and basic testsRené Scharfe2014-10-014-0/+110
* | | | | | | | | | | | Merge branch 'mh/lockfile-stdio'Junio C Hamano2014-10-145-39/+71
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | commit_packed_refs(): reimplement using fdopen_lock_file()mh/lockfile-stdioMichael Haggerty2014-10-011-4/+1
| * | | | | | | | | | | | dump_marks(): reimplement using fdopen_lock_file()Michael Haggerty2014-10-011-19/+2
| * | | | | | | | | | | | fdopen_lock_file(): access a lockfile using stdioMichael Haggerty2014-10-013-16/+68
* | | | | | | | | | | | | Merge branch 'mh/lockfile'Junio C Hamano2014-10-1436-260/+510
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | lockfile.h: extract new header file for the functions in lockfile.cmh/lockfileMichael Haggerty2014-10-0135-83/+118
| * | | | | | | | | | | | hold_locked_index(): move from lockfile.c to read-cache.cMichael Haggerty2014-10-012-8/+8
| * | | | | | | | | | | | hold_lock_file_for_append(): restore errno before returningMichael Haggerty2014-10-011-1/+8
| * | | | | | | | | | | | get_locked_file_path(): new functionMichael Haggerty2014-10-014-3/+16
| * | | | | | | | | | | | lockfile.c: rename static functionsMichael Haggerty2014-10-011-5/+5
| * | | | | | | | | | | | lockfile: rename LOCK_NODEREF to LOCK_NO_DEREFMichael Haggerty2014-10-014-5/+5
| * | | | | | | | | | | | commit_lock_file_to(): refactor a helper out of commit_lock_file()Michael Haggerty2014-10-014-38/+50
| * | | | | | | | | | | | trim_last_path_component(): replace last_path_elm()Michael Haggerty2014-10-011-22/+16
| * | | | | | | | | | | | resolve_symlink(): take a strbuf parameterMichael Haggerty2014-10-011-35/+22
| * | | | | | | | | | | | resolve_symlink(): use a strbuf for internal scratch spaceMichael Haggerty2014-10-011-21/+12