aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'po/doc-status-markup'Junio C Hamano2014-10-24
|\
| * doc: fix 'git status --help' character quotingPhilip Oakley2014-10-19
* | Merge branch 'jk/pack-objects-no-bitmap-when-splitting'Junio C Hamano2014-10-24
|\ \
| * | pack-objects: turn off bitmaps when we split packsJeff King2014-10-19
* | | Update draft release notes to 2.2Junio C Hamano2014-10-21
* | | Merge branch 'js/completion-hide-not-a-repo'Junio C Hamano2014-10-21
|\ \ \
| * | | completion: silence "fatal: Not a git repository" errorJohn Szakmeister2014-10-14
* | | | Merge branch 'da/mergetool-meld'Junio C Hamano2014-10-21
|\ \ \ \
| * | | | mergetools/meld: make usage of `--output` configurable and more robustDavid Aguilar2014-10-16
| | |_|/ | |/| |
* | | | Merge branch 'da/mergetool-temporary-directory'Junio C Hamano2014-10-21
|\ \ \ \
| * | | | t7610-mergetool: add test cases for mergetool.writeToTempDavid Aguilar2014-10-16
| * | | | mergetool: add an option for writing to a temporary directoryDavid Aguilar2014-10-16
* | | | | Merge branch 'da/mergetool-tool-help'Junio C Hamano2014-10-21
|\ \ \ \ \
| * | | | | difftool: don't assume that default sh is saneCharles Bailey2014-10-15
| * | | | | mergetool: don't require a work tree for --tool-helpCharles Bailey2014-10-15
| * | | | | git-sh-setup: move GIT_DIR initialization into a functionDavid Aguilar2014-10-15
| * | | | | mergetool: use more conservative temporary filenamesDavid Aguilar2014-10-15
| * | | | | test-lib-functions: adjust style to match CodingGuidelinesDavid Aguilar2014-10-15
| * | | | | t7610-mergetool: prefer test_config over git configDavid Aguilar2014-10-15
* | | | | | Merge branch 'da/mergetool-temporary-filename'Junio C Hamano2014-10-21
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | mergetool: use more conservative temporary filenamesDavid Aguilar2014-10-16
* | | | | | Merge branch 'da/mergetool-tests'Junio C Hamano2014-10-21
|\ \ \ \ \ \ | |/ / / / /
| * | | | | test-lib-functions: adjust style to match CodingGuidelinesDavid Aguilar2014-10-16
| * | | | | t7610-mergetool: use test_config to isolate testsDavid Aguilar2014-10-16
| |/ / / /
| * | | | t7610-mergetool: add missing && and remove commented-out codeDavid Aguilar2014-10-15
| * | | | t7610-mergetool: use tabs instead of a mix of tabs and spacesDavid Aguilar2014-10-15
| | |_|/ | |/| |
* | | | Merge branch 'rs/ref-transaction'Junio C Hamano2014-10-21
|\ \ \ \
| * | | | ref_transaction_commit: bail out on failure to remove a refJonathan Nieder2014-10-15
| * | | | lockfile: remove unable_to_lock_errorJonathan Nieder2014-10-15
| * | | | refs.c: do not permit err == NULLJonathan Nieder2014-10-15
| * | | | remote rm/prune: print a message when writing packed-refs failsRonnie Sahlberg2014-10-15
| * | | | for-each-ref: skip and warn about broken ref namesRonnie Sahlberg2014-10-15
| * | | | refs.c: allow listing and deleting badly named refsRonnie Sahlberg2014-10-15
| * | | | test: put tests for handling of bad ref names in one placeRonnie Sahlberg2014-10-15
| * | | | packed-ref cache: forbid dot-components in refnamesJonathan Nieder2014-10-15
| * | | | branch -d: simplify by using RESOLVE_REF_READINGRonnie Sahlberg2014-10-15
| * | | | branch -d: avoid repeated symref resolutionJonathan Nieder2014-10-15
| * | | | reflog test: test interaction with detached HEADJunio C Hamano2014-10-15
| * | | | refs.c: change resolve_ref_unsafe reading argument to be a flags fieldRonnie Sahlberg2014-10-15
| * | | | refs.c: make write_ref_sha1 staticRonnie Sahlberg2014-10-15
| * | | | fetch.c: change s_update_ref to use a ref transactionRonnie Sahlberg2014-10-15
| * | | | refs.c: ref_transaction_commit: distinguish name conflicts from other errorsRonnie Sahlberg2014-10-15
| * | | | refs.c: pass a list of names to skip to is_refname_availableRonnie Sahlberg2014-10-15
| * | | | refs.c: call lock_ref_sha1_basic directly from commitRonnie Sahlberg2014-10-15
| * | | | refs.c: refuse to lock badly named refs in lock_ref_sha1_basicRonnie Sahlberg2014-10-15
| * | | | rename_ref: don't ask read_ref_full where the ref came fromRonnie Sahlberg2014-10-15
| * | | | refs.c: pass the ref log message to _create/delete/update instead of _commitRonnie Sahlberg2014-10-15
| * | | | refs.c: add an err argument to delete_ref_looseRonnie Sahlberg2014-10-15
| * | | | wrapper.c: add a new function unlink_or_msgRonnie Sahlberg2014-10-15
| * | | | refs.c: lock_ref_sha1_basic is used for all refsRonnie Sahlberg2014-10-15