| Commit message (Expand) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | | | | | | | | | | | | | | | | | builtin/send-pack.c: use parse_options API | Dave Borowitz | 2015-08-19 | 1 | -104/+59 | |
| * | | | | | | | | | | | | | | | | | | | Merge branch 'jk/notes-merge-config' | Junio C Hamano | 2015-08-31 | 1 | -13/+30 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | notes: teach git-notes about notes.<name>.mergeStrategy optionjk/notes-merge-config | Jacob Keller | 2015-08-17 | 1 | -1/+13 | |
| | * | | | | | | | | | | | | | | | | | | | notes: add notes.mergeStrategy option to select default strategy | Jacob Keller | 2015-08-17 | 1 | -2/+17 | |
| | * | | | | | | | | | | | | | | | | | | | notes: extract parse_notes_merge_strategy to notes-utils | Jacob Keller | 2015-08-17 | 1 | -11/+1 | |
| * | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/am-state-fix' | Junio C Hamano | 2015-08-31 | 4 | -34/+48 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | write_file(): drop caller-supplied LF from calls to create a one-liner filejc/am-state-fix | Junio C Hamano | 2015-08-25 | 2 | -6/+6 | |
| | * | | | | | | | | | | | | | | | | | | | | write_file_v(): do not leave incomplete line at the end | Junio C Hamano | 2015-08-25 | 1 | -8/+2 | |
| | * | | | | | | | | | | | | | | | | | | | | write_file(): drop "fatal" parameter | Junio C Hamano | 2015-08-24 | 4 | -9/+9 | |
| | * | | | | | | | | | | | | | | | | | | | | builtin/am: make sure state files are text | Junio C Hamano | 2015-08-24 | 1 | -2/+8 | |
| | * | | | | | | | | | | | | | | | | | | | | builtin/am: introduce write_state_*() helper functions | Junio C Hamano | 2015-08-24 | 1 | -27/+41 | |
| | | |_|_|_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/log-p-cc' | Junio C Hamano | 2015-08-31 | 1 | -9/+16 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | builtin/log.c: minor reformatjc/log-p-cc | Junio C Hamano | 2015-08-25 | 1 | -4/+2 | |
| | * | | | | | | | | | | | | | | | | | | | | log: show merge commit when --cc is given | Junio C Hamano | 2015-08-20 | 1 | -0/+4 | |
| | * | | | | | | | | | | | | | | | | | | | | log: when --cc is given, default to -p unless told otherwise | Junio C Hamano | 2015-08-20 | 1 | -0/+4 | |
| | * | | | | | | | | | | | | | | | | | | | | log: rename "tweak" helpers | Junio C Hamano | 2015-08-20 | 1 | -5/+6 | |
| * | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/rev-list-has-no-notes' | Junio C Hamano | 2015-08-31 | 1 | -0/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | rev-list: make it obvious that we do not support notesjk/rev-list-has-no-notes | Jeff King | 2015-08-24 | 1 | -0/+3 | |
| | | |_|_|_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | Merge branch 'sb/remove-unused-var-from-builtin-add' into maint | Junio C Hamano | 2015-08-19 | 1 | -2/+0 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ib/scripted-parse-opt-better-hint-string' into maint | Junio C Hamano | 2015-08-19 | 1 | -27/+30 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'db/send-pack-user-signingkey' into maint | Junio C Hamano | 2015-08-19 | 1 | -0/+3 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | Merge branch 'jx/do-not-crash-receive-pack-wo-head' into maint | Junio C Hamano | 2015-08-19 | 1 | -1/+1 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | Merge branch 'hv/submodule-config' | Junio C Hamano | 2015-08-31 | 2 | -0/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | submodule: allow erroneous values for the fetchRecurseSubmodules optionhv/submodule-config | Heiko Voigt | 2015-08-19 | 1 | -0/+1 | |
| | * | | | | | | | | | | | | | | | | | | | | | | submodule: use new config API for worktree configurations | Heiko Voigt | 2015-08-19 | 1 | -0/+1 | |
| * | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sg/config-name-only' | Junio C Hamano | 2015-08-31 | 1 | -45/+41 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | get_urlmatch: avoid useless strbuf writesg/config-name-only | Jeff King | 2015-08-20 | 1 | -4/+1 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | format_config: simplify buffer handling | Jeff King | 2015-08-20 | 1 | -22/+16 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | format_config: don't init strbuf | Jeff King | 2015-08-20 | 1 | -2/+1 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | config: restructure format_config() for better control flow | SZEDER Gábor | 2015-08-20 | 1 | -41/+37 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | config: add '--name-only' option to list only variable names | SZEDER Gábor | 2015-08-10 | 1 | -2/+12 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/calloc-pathspec' | Junio C Hamano | 2015-08-26 | 2 | -2/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | ps_matched: xcalloc() takes nmemb and then element sizejc/calloc-pathspec | Junio C Hamano | 2015-08-20 | 2 | -2/+2 | |
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ss/clone-guess-dir-name-simplify' into maint | Junio C Hamano | 2015-08-03 | 1 | -13/+6 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mh/reporting-broken-refs-from-for-each-ref' into maint | Junio C Hamano | 2015-08-03 | 1 | -0/+5 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ls/hint-rev-list-count' into maint | Junio C Hamano | 2015-07-27 | 1 | -0/+1 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/rev-list-no-bitmap-while-pruning' into maint | Junio C Hamano | 2015-07-27 | 1 | -1/+1 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/index-pack-reduce-recheck' into maint | Junio C Hamano | 2015-07-27 | 1 | -1/+1 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'pt/am-builtin' | Junio C Hamano | 2015-08-26 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | i18n: am: fix typo in description of -b option | Jiang Xin | 2015-08-26 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'pt/am-builtin-abort-fix' | Junio C Hamano | 2015-08-26 | 1 | -13/+36 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | am --skip/--abort: merge HEAD/ORIG_HEAD tree into indexpt/am-builtin-abort-fix | Paul Tan | 2015-08-19 | 1 | -13/+36 | |
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mh/tempfile' | Junio C Hamano | 2015-08-25 | 4 | -29/+20 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | gc: use tempfile module to handle gc.pid file | Michael Haggerty | 2015-08-12 | 1 | -20/+5 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | lock_repo_for_gc(): compute the path to "gc.pid" only once | Michael Haggerty | 2015-08-12 | 1 | -3/+6 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | lockfile: add accessor get_lock_file_path() | Michael Haggerty | 2015-08-10 | 1 | -7/+8 | |
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'pt/am-builtin-options' | Junio C Hamano | 2015-08-25 | 1 | -6/+36 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | am: let --signoff override --no-signoffpt/am-builtin-options | Paul Tan | 2015-08-12 | 1 | -3/+25 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | am: let command-line options override saved options | Paul Tan | 2015-08-12 | 1 | -4/+12 | |
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'dt/notes-multiple' | Junio C Hamano | 2015-08-25 | 1 | -0/+6 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
 |
index : delta/git.git | |
| github.com: git/git.git |
| summaryrefslogtreecommitdiff |