Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jn/parse-config-slot' | Junio C Hamano | 2014-10-20 | 13 | -50/+47 |
|\ | |||||
| * | color_parse: do not mention variable name in error messagejn/parse-config-slot | Jeff King | 2014-10-14 | 11 | -28/+26 |
| * | pass config slots as pointers instead of offsets | Jonathan Nieder | 2014-10-14 | 5 | -22/+21 |
* | | Merge branch 'rs/receive-pack-argv-leak-fix' | Junio C Hamano | 2014-10-20 | 1 | -10/+8 |
|\ \ | |||||
| * | | receive-pack: plug minor memory leak in unpack()rs/receive-pack-argv-leak-fix | René Scharfe | 2014-10-13 | 1 | -10/+8 |
* | | | Merge branch 'ta/config-set' | Junio C Hamano | 2014-10-20 | 1 | -2/+2 |
|\ \ \ | |||||
| * | | | t1308: fix broken here document in test scriptta/config-set | Junio C Hamano | 2014-10-13 | 1 | -2/+2 |
* | | | | Merge branch 'jk/test-shell-trace' | Junio C Hamano | 2014-10-20 | 4 | -35/+84 |
|\ \ \ \ | |||||
| * | | | | test-lib.sh: support -x option for shell-tracingjk/test-shell-trace | Jeff King | 2014-10-13 | 2 | -4/+44 |
| * | | | | t5304: use helper to report failure of "test foo = bar" | Jeff King | 2014-10-13 | 2 | -8/+17 |
| * | | | | t5304: use test_path_is_* instead of "test -f" | Jeff King | 2014-10-13 | 1 | -23/+23 |
* | | | | | Merge branch 'bc/asciidoc' | Junio C Hamano | 2014-10-20 | 4 | -5/+5 |
|\ \ \ \ \ | |||||
| * | | | | | Documentation: fix mismatched delimiters in git-imap-sendbc/asciidoc | brian m. carlson | 2014-10-13 | 1 | -2/+2 |
| * | | | | | Documentation: adjust document title underlining | brian m. carlson | 2014-10-13 | 3 | -3/+3 |
| |/ / / / | |||||
* | | | | | Revert "archive: honor tar.umask even for pax headers" | Junio C Hamano | 2014-10-20 | 2 | -7/+2 |
* | | | | | Merge branch 'jc/completion-no-chdir' | Junio C Hamano | 2014-10-16 | 1 | -11/+7 |
|\ \ \ \ \ | |||||
| * | | | | | completion: use "git -C $there" instead of (cd $there && git ...)jc/completion-no-chdir | Junio C Hamano | 2014-10-09 | 1 | -11/+7 |
* | | | | | | Merge branch 'bw/trace-no-inline-getnanotime' | Junio C Hamano | 2014-10-16 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | trace.c: do not mark getnanotime() as "inline"bw/trace-no-inline-getnanotime | Ben Walton | 2014-09-29 | 1 | -1/+1 |
* | | | | | | | Merge branch 'po/everyday-doc' | Junio C Hamano | 2014-10-16 | 12 | -131/+185 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | doc: add 'everyday' to 'git help' | Philip Oakley | 2014-10-10 | 12 | -21/+32 |
| * | | | | | | | doc: Makefile regularise OBSOLETE_HTML list building | Philip Oakley | 2014-10-10 | 1 | -1/+2 |
| * | | | | | | | doc: modernise everyday.txt wording and format in man page style | Philip Oakley | 2014-10-10 | 1 | -109/+151 |
* | | | | | | | | Update draft release notes to 2.2 | Junio C Hamano | 2014-10-14 | 1 | -0/+21 |
* | | | | | | | | Merge branch 'bc/asciidoc-pretty-formats-fix' | Junio C Hamano | 2014-10-14 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Documentation: fix misrender of pretty-formats in Asciidoctorbc/asciidoc-pretty-formats-fix | brian m. carlson | 2014-10-08 | 1 | -1/+1 |
* | | | | | | | | | Merge branch 'rs/plug-leak-in-bundle' | Junio C Hamano | 2014-10-14 | 1 | -7/+10 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | bundle: plug minor memory leak in is_tag_in_date_range()rs/plug-leak-in-bundle | René Scharfe | 2014-10-07 | 1 | -7/+10 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'rs/more-uses-of-skip-prefix' | Junio C Hamano | 2014-10-14 | 10 | -75/+69 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | use skip_prefix() to avoid more magic numbersrs/more-uses-of-skip-prefix | René Scharfe | 2014-10-07 | 10 | -75/+69 |
* | | | | | | | | | | Merge branch 'rs/mailsplit' | Junio C Hamano | 2014-10-14 | 1 | -1/+0 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | mailsplit: remove unnecessary unlink(2) callrs/mailsplit | René Scharfe | 2014-10-07 | 1 | -1/+0 |
* | | | | | | | | | | | Merge branch 'rs/sha1-array-test' | Junio C Hamano | 2014-10-14 | 5 | -2/+130 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | sha1-lookup: handle duplicates in sha1_pos()rs/sha1-array-test | René Scharfe | 2014-10-01 | 2 | -2/+20 |
| * | | | | | | | | | | | sha1-array: add test-sha1-array and basic tests | René Scharfe | 2014-10-01 | 4 | -0/+110 |
* | | | | | | | | | | | | Merge branch 'mh/lockfile-stdio' | Junio C Hamano | 2014-10-14 | 5 | -39/+71 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | commit_packed_refs(): reimplement using fdopen_lock_file()mh/lockfile-stdio | Michael Haggerty | 2014-10-01 | 1 | -4/+1 |
| * | | | | | | | | | | | | dump_marks(): reimplement using fdopen_lock_file() | Michael Haggerty | 2014-10-01 | 1 | -19/+2 |
| * | | | | | | | | | | | | fdopen_lock_file(): access a lockfile using stdio | Michael Haggerty | 2014-10-01 | 3 | -16/+68 |
* | | | | | | | | | | | | | Merge branch 'mh/lockfile' | Junio C Hamano | 2014-10-14 | 36 | -260/+510 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | lockfile.h: extract new header file for the functions in lockfile.cmh/lockfile | Michael Haggerty | 2014-10-01 | 35 | -83/+118 |
| * | | | | | | | | | | | | hold_locked_index(): move from lockfile.c to read-cache.c | Michael Haggerty | 2014-10-01 | 2 | -8/+8 |
| * | | | | | | | | | | | | hold_lock_file_for_append(): restore errno before returning | Michael Haggerty | 2014-10-01 | 1 | -1/+8 |
| * | | | | | | | | | | | | get_locked_file_path(): new function | Michael Haggerty | 2014-10-01 | 4 | -3/+16 |
| * | | | | | | | | | | | | lockfile.c: rename static functions | Michael Haggerty | 2014-10-01 | 1 | -5/+5 |
| * | | | | | | | | | | | | lockfile: rename LOCK_NODEREF to LOCK_NO_DEREF | Michael Haggerty | 2014-10-01 | 4 | -5/+5 |
| * | | | | | | | | | | | | commit_lock_file_to(): refactor a helper out of commit_lock_file() | Michael Haggerty | 2014-10-01 | 4 | -38/+50 |
| * | | | | | | | | | | | | trim_last_path_component(): replace last_path_elm() | Michael Haggerty | 2014-10-01 | 1 | -22/+16 |
| * | | | | | | | | | | | | resolve_symlink(): take a strbuf parameter | Michael Haggerty | 2014-10-01 | 1 | -35/+22 |
| * | | | | | | | | | | | | resolve_symlink(): use a strbuf for internal scratch space | Michael Haggerty | 2014-10-01 | 1 | -21/+12 |