aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | reflog: add missing single quote to error messageAlex Henrie2015-08-28
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ah/read-tree-usage-string'Junio C Hamano2015-09-01
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | read-tree: replace bracket set with parentheses to clarify usageAlex Henrie2015-08-28
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ah/pack-objects-usage-strings'Junio C Hamano2015-09-01
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pack-objects: place angle brackets around placeholders in usage stringsAlex Henrie2015-08-28
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'br/svn-doc-include-paths-config'Junio C Hamano2015-09-01
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-svn doc: mention "svn-remote.<name>.include-paths"Brett Randall2015-08-26
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/fixup-linked-gitdir'Junio C Hamano2015-09-01
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | / / / / / / / / | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | setup: update the right file in multiple checkoutsNguyễn Thái Ngọc Duy2015-08-25
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Eighth batch for 2.6Junio C Hamano2015-08-31
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sg/describe-contains'Junio C Hamano2015-08-31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | describe --contains: default to HEAD when no commit-ish is givenSZEDER Gábor2015-08-25
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'db/push-sign-if-asked'Junio C Hamano2015-08-31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | push: add a config option push.gpgSign for default signed pushesDave Borowitz2015-08-19
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | push: support signing pushes iff the server supports itDave Borowitz2015-08-19
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | builtin/send-pack.c: use parse_options APIDave Borowitz2015-08-19
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | config.c: rename git_config_maybe_bool_text and export it as git_parse_maybe_...Dave Borowitz2015-08-19
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | transport: remove git_transport_options.push_certDave Borowitz2015-08-19
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gitremote-helpers.txt: document pushcert optionDave Borowitz2015-08-19
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation/git-send-pack.txt: document --signedDave Borowitz2015-08-19
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation/git-send-pack.txt: wrap long synopsis lineDave Borowitz2015-08-19
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation/git-push.txt: document when --signed may failDave Borowitz2015-08-19
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/notes-merge-config'Junio C Hamano2015-08-31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | notes: teach git-notes about notes.<name>.mergeStrategy optionJacob Keller2015-08-17
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | notes: add notes.mergeStrategy option to select default strategyJacob Keller2015-08-17
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | notes: add tests for --commit/--abort/--strategy exclusivityJacob Keller2015-08-17
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | notes: extract parse_notes_merge_strategy to notes-utilsJacob Keller2015-08-17
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | notes: extract enum notes_merge_strategy to notes-utils.hJacob Keller2015-08-17
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | notes: document cat_sort_uniq rewriteModeJacob Keller2015-08-17
| | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/am-state-fix'Junio C Hamano2015-08-31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | write_file(): drop caller-supplied LF from calls to create a one-liner fileJunio C Hamano2015-08-25
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | write_file_v(): do not leave incomplete line at the endJunio C Hamano2015-08-25
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | write_file(): drop "fatal" parameterJunio C Hamano2015-08-24
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | builtin/am: make sure state files are textJunio C Hamano2015-08-24
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | builtin/am: introduce write_state_*() helper functionsJunio C Hamano2015-08-24
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/log-p-cc'Junio C Hamano2015-08-31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | builtin/log.c: minor reformatJunio C Hamano2015-08-25
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | log: show merge commit when --cc is givenJunio C Hamano2015-08-20
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | log: when --cc is given, default to -p unless told otherwiseJunio C Hamano2015-08-20
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | log: rename "tweak" helpersJunio C Hamano2015-08-20
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/fix-alias-pager-config-key-warnings'Junio C Hamano2015-08-31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | config: silence warnings for command names with invalid keysJeff King2015-08-24
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/rev-list-has-no-notes'Junio C Hamano2015-08-31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rev-list: make it obvious that we do not support notesJeff King2015-08-24
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'hv/submodule-config'Junio C Hamano2015-08-31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | submodule: allow erroneous values for the fetchRecurseSubmodules optionHeiko Voigt2015-08-19
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | submodule: use new config API for worktree configurationsHeiko Voigt2015-08-19
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | submodule: extract functions for config set and lookupHeiko Voigt2015-08-19
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | submodule: implement a config API for lookup of .gitmodules valuesHeiko Voigt2015-08-19
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sg/config-name-only'Junio C Hamano2015-08-31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |