summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | Merge branch 'mm/log-branch-desc-plug-leak'Junio C Hamano2014-09-091-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | builtin/log.c: fix minor memory leakmm/log-branch-desc-plug-leakMatthieu Moy2014-08-071-0/+1
| |/ / / / / / /
* | | | | | | | Merge branch 'lf/bundle-exclusion'Junio C Hamano2014-09-092-3/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | bundle: fix exclusion of annotated tagslf/bundle-exclusionLukas Fleischer2014-08-072-3/+6
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'jc/apply-ws-prefix'Junio C Hamano2014-09-093-63/+96
|\ \ \ \ \ \ \ \
| * | | | | | | | apply: omit ws check for excluded pathsjc/apply-ws-prefixJunio C Hamano2014-08-072-3/+17
| * | | | | | | | apply: hoist use_patch() helper for path exclusion upJunio C Hamano2014-08-071-38/+43
| * | | | | | | | apply: use the right attribute for paths in non-Git patchesJunio C Hamano2014-08-072-22/+36
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'jk/command-line-config-empty-string'Junio C Hamano2014-09-093-2/+26
|\ \ \ \ \ \ \ \
| * | | | | | | | config: teach "git -c" to recognize an empty stringjk/command-line-config-empty-stringJunio C Hamano2014-08-053-2/+26
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'bc/imap-send-doc'Junio C Hamano2014-09-091-4/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | imap-send doc: omit confusing "to use imap-send" modifierbc/imap-send-docbrian m. carlson2014-08-051-4/+3
| |/ / / / / / /
* | | | | | | | Merge branch 'jc/not-mingw-cygwin'Junio C Hamano2014-09-0915-60/+56
|\ \ \ \ \ \ \ \
| * | | | | | | | test prerequisites: enumerate with commasjc/not-mingw-cygwinJunio C Hamano2014-07-212-9/+9
| * | | | | | | | test prerequisites: eradicate NOT_FOOJunio C Hamano2014-07-2115-60/+56
* | | | | | | | | Start the post-2.1 cycleJunio C Hamano2014-09-023-2/+54
* | | | | | | | | Merge branch 'rs/strbuf-getcwd'Junio C Hamano2014-09-0215-178/+191
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | use strbuf_add_absolute_path() to add absolute pathsrs/strbuf-getcwdRené Scharfe2014-08-261-5/+1
| * | | | | | | | | abspath: convert absolute_path() to strbufRené Scharfe2014-08-264-42/+37
| * | | | | | | | | use xgetcwd() to set $GIT_DIRRené Scharfe2014-08-262-6/+6
| * | | | | | | | | use xgetcwd() to get the current directory or dieRené Scharfe2014-08-265-22/+26
| * | | | | | | | | wrapper: add xgetcwd()René Scharfe2014-08-262-0/+9
| * | | | | | | | | abspath: convert real_path_internal() to strbufRené Scharfe2014-08-261-44/+25
| * | | | | | | | | abspath: use strbuf_getcwd() to remember original working directoryRené Scharfe2014-08-261-4/+5
| * | | | | | | | | setup: convert setup_git_directory_gently_1 et al. to strbufRené Scharfe2014-08-261-43/+44
| * | | | | | | | | unix-sockets: use strbuf_getcwd()René Scharfe2014-07-281-7/+7
| * | | | | | | | | strbuf: add strbuf_getcwd()René Scharfe2014-07-283-0/+26
* | | | | | | | | | Merge branch 'ta/pretty-parse-config'Junio C Hamano2014-09-021-1/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | pretty.c: make git_pretty_formats_config return -1 on git_config_string failureta/pretty-parse-configTanay Abhra2014-08-041-1/+3
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'bc/archive-pax-header-mode'Junio C Hamano2014-09-022-2/+7
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | archive: honor tar.umask even for pax headersbc/archive-pax-header-modebrian m. carlson2014-08-042-2/+7
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'pr/remotes-in-hashmap'Junio C Hamano2014-09-022-17/+49
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | use a hashmap to make remotes fasterpr/remotes-in-hashmapPatrick Reynolds2014-07-302-17/+49
* | | | | | | | | | | Merge branch 'jk/pretty-empty-format'Junio C Hamano2014-09-025-6/+14
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | pretty: make empty userformats truly emptyjk/pretty-empty-formatJeff King2014-07-304-3/+11
| * | | | | | | | | | | pretty: treat "--format=" as an empty userformatJeff King2014-07-301-2/+2
| * | | | | | | | | | | revision: drop useless string offset when parsing "--pretty"Jeff King2014-07-301-1/+1
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'ta/config-set'Junio C Hamano2014-09-028-0/+801
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | test-config: add tests for the config_set APITanay Abhra2014-07-294-0/+344
| * | | | | | | | | | | add `config_set` API for caching config-like filesTanay Abhra2014-07-294-0/+457
* | | | | | | | | | | | Merge branch 'rs/init-no-duplicate-real-path'Junio C Hamano2014-09-021-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | init: avoid superfluous real_path() callsrs/init-no-duplicate-real-pathRené Scharfe2014-07-281-4/+4
* | | | | | | | | | | | | Merge branch 'mm/config-edit-global'Junio C Hamano2014-09-025-10/+69
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | commit: advertise config --global --edit on guessed identitymm/config-edit-globalMatthieu Moy2014-07-251-2/+33
| * | | | | | | | | | | | | home_config_paths(): let the caller ignore xdg pathMatthieu Moy2014-07-251-4/+6
| * | | | | | | | | | | | | config --global --edit: create a template file if neededMatthieu Moy2014-07-253-4/+30
* | | | | | | | | | | | | | Merge branch 'jc/reopen-lock-file'Junio C Hamano2014-09-022-0/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | lockfile: allow reopening a closed but still locked filejc/reopen-lock-fileJunio C Hamano2014-07-142-0/+11
* | | | | | | | | | | | | | | Merge git://github.com/git-l10n/git-poJunio C Hamano2014-08-292-1359/+1515
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | po/TEAMS: add new members to German translation teamRalf Thielow2014-08-291-0/+2