aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'jk/more-comments-on-textconv'Junio C Hamano2016-02-26
|\
| * diff: clarify textconv interfaceJeff King2016-02-22
* | Merge branch 'jk/no-diff-emit-common'Junio C Hamano2016-02-26
|\ \
| * | xdiff: drop XDL_EMIT_COMMONJeff King2016-02-22
| * | merge-tree: drop generate_common strategyJeff King2016-02-22
| * | merge-one-file: use empty blob for add/add baseJeff King2016-02-22
| |/
* | Merge branch 'ak/git-strip-extension-from-dashed-command'Junio C Hamano2016-02-26
|\ \
| * | git.c: simplify stripping extension of a file in handle_builtin()Alexander Kuleshov2016-02-21
* | | Merge branch 'ak/extract-argv0-last-dir-sep'Junio C Hamano2016-02-26
|\ \ \
| * | | exec_cmd.c: use find_last_dir_sep() for code simplificationAlexander Kuleshov2016-02-19
| | |/ | |/|
* | | Merge branch 'kn/ref-filter-atom-parsing'Junio C Hamano2016-02-26
|\ \ \
| * | | ref-filter: introduce objectname_atom_parser()Karthik Nayak2016-02-17
| * | | ref-filter: introduce contents_atom_parser()Karthik Nayak2016-02-17
| * | | ref-filter: introduce remote_ref_atom_parser()Karthik Nayak2016-02-17
| * | | ref-filter: align: introduce long-form syntaxKarthik Nayak2016-02-17
| * | | ref-filter: introduce align_atom_parser()Karthik Nayak2016-02-17
| * | | ref-filter: introduce parse_align_position()Karthik Nayak2016-02-17
| * | | ref-filter: introduce color_atom_parser()Karthik Nayak2016-02-17
| * | | ref-filter: introduce parsing functions for each valid atomKarthik Nayak2016-02-17
| * | | ref-filter: introduce struct used_atomKarthik Nayak2016-02-17
| * | | ref-filter: bump 'used_atom' and related code to the topKarthik Nayak2016-02-17
| * | | ref-filter: use string_list_split over strbuf_splitJeff King2016-02-17
* | | | Merge branch 'tg/git-remote'Junio C Hamano2016-02-26
|\ \ \ \
| * | | | remote: use remote_is_configured() for add and renameThomas Gummerer2016-02-16
| * | | | remote: actually check if remote exitsThomas Gummerer2016-02-16
| * | | | remote: simplify remote_is_configured()Thomas Gummerer2016-02-16
| * | | | remote: use parse_config_keyThomas Gummerer2016-02-16
* | | | | Eighth batch for 2.8Junio C Hamano2016-02-24
* | | | | Merge branch 'jc/am-i-v-fix'Junio C Hamano2016-02-24
|\ \ \ \ \
| * | | | | am -i: fix "v"iewJunio C Hamano2016-02-17
| * | | | | pager: factor out a helper to prepare a child process to run the pagerJunio C Hamano2016-02-17
| * | | | | pager: lose a separate argv[]Junio C Hamano2016-02-16
* | | | | | Merge branch 'nd/worktree-add-B'Junio C Hamano2016-02-24
|\ \ \ \ \ \
| * | | | | | worktree add -B: do the checkout test before update branchNguyễn Thái Ngọc Duy2016-02-15
| * | | | | | worktree: fix "add -B"Nguyễn Thái Ngọc Duy2016-02-15
* | | | | | | Merge branch 'nd/exclusion-regression-fix'Junio C Hamano2016-02-24
|\ \ \ \ \ \ \
| * | | | | | | dir.c: don't exclude whole dir prematurelyNguyễn Thái Ngọc Duy2016-02-15
| * | | | | | | dir.c: support marking some patterns already matchedNguyễn Thái Ngọc Duy2016-02-15
| * | | | | | | dir.c: support tracing excludeNguyễn Thái Ngọc Duy2016-02-15
| * | | | | | | dir.c: fix match_pathname()Nguyễn Thái Ngọc Duy2016-02-15
* | | | | | | | Merge branch 'ce/https-public-key-pinning'Junio C Hamano2016-02-24
|\ \ \ \ \ \ \ \
| * | | | | | | | http: implement public key pinningChristoph Egger2016-02-15
* | | | | | | | | Merge branch 'bc/http-empty-auth'Junio C Hamano2016-02-24
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | http: add option to try authentication without usernamebrian m. carlson2016-02-15
| |/ / / / / / / /
* | | | | | | | | Merge branch 'sp/remote-curl-ssl-strerror'Junio C Hamano2016-02-24
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | remote-curl: include curl_errorstr on SSL setup failuresShawn Pearce2016-02-15
| |/ / / / / / / /
* | | | | | | | | Merge branch 'jk/lose-name-path'Junio C Hamano2016-02-24
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | list-objects: pass full pathname to callbacksJeff King2016-02-12
| * | | | | | | | | list-objects: drop name_path entirelyJeff King2016-02-12
| * | | | | | | | | list-objects: convert name_path to a strbufJeff King2016-02-12