Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Start the post-2.1 cycle | Junio C Hamano | 2014-09-02 | 3 | -2/+54 |
* | Merge branch 'rs/strbuf-getcwd' | Junio C Hamano | 2014-09-02 | 15 | -178/+191 |
|\ | |||||
| * | use strbuf_add_absolute_path() to add absolute pathsrs/strbuf-getcwd | René Scharfe | 2014-08-26 | 1 | -5/+1 |
| * | abspath: convert absolute_path() to strbuf | René Scharfe | 2014-08-26 | 4 | -42/+37 |
| * | use xgetcwd() to set $GIT_DIR | René Scharfe | 2014-08-26 | 2 | -6/+6 |
| * | use xgetcwd() to get the current directory or die | René Scharfe | 2014-08-26 | 5 | -22/+26 |
| * | wrapper: add xgetcwd() | René Scharfe | 2014-08-26 | 2 | -0/+9 |
| * | abspath: convert real_path_internal() to strbuf | René Scharfe | 2014-08-26 | 1 | -44/+25 |
| * | abspath: use strbuf_getcwd() to remember original working directory | René Scharfe | 2014-08-26 | 1 | -4/+5 |
| * | setup: convert setup_git_directory_gently_1 et al. to strbuf | René Scharfe | 2014-08-26 | 1 | -43/+44 |
| * | unix-sockets: use strbuf_getcwd() | René Scharfe | 2014-07-28 | 1 | -7/+7 |
| * | strbuf: add strbuf_getcwd() | René Scharfe | 2014-07-28 | 3 | -0/+26 |
* | | Merge branch 'ta/pretty-parse-config' | Junio C Hamano | 2014-09-02 | 1 | -1/+3 |
|\ \ | |||||
| * | | pretty.c: make git_pretty_formats_config return -1 on git_config_string failureta/pretty-parse-config | Tanay Abhra | 2014-08-04 | 1 | -1/+3 |
* | | | Merge branch 'bc/archive-pax-header-mode' | Junio C Hamano | 2014-09-02 | 2 | -2/+7 |
|\ \ \ | |||||
| * | | | archive: honor tar.umask even for pax headersbc/archive-pax-header-mode | brian m. carlson | 2014-08-04 | 2 | -2/+7 |
* | | | | Merge branch 'pr/remotes-in-hashmap' | Junio C Hamano | 2014-09-02 | 2 | -17/+49 |
|\ \ \ \ | |||||
| * | | | | use a hashmap to make remotes fasterpr/remotes-in-hashmap | Patrick Reynolds | 2014-07-30 | 2 | -17/+49 |
* | | | | | Merge branch 'jk/pretty-empty-format' | Junio C Hamano | 2014-09-02 | 5 | -6/+14 |
|\ \ \ \ \ | |||||
| * | | | | | pretty: make empty userformats truly emptyjk/pretty-empty-format | Jeff King | 2014-07-30 | 4 | -3/+11 |
| * | | | | | pretty: treat "--format=" as an empty userformat | Jeff King | 2014-07-30 | 1 | -2/+2 |
| * | | | | | revision: drop useless string offset when parsing "--pretty" | Jeff King | 2014-07-30 | 1 | -1/+1 |
| |/ / / / | |||||
* | | | | | Merge branch 'ta/config-set' | Junio C Hamano | 2014-09-02 | 8 | -0/+801 |
|\ \ \ \ \ | |||||
| * | | | | | test-config: add tests for the config_set API | Tanay Abhra | 2014-07-29 | 4 | -0/+344 |
| * | | | | | add `config_set` API for caching config-like files | Tanay Abhra | 2014-07-29 | 4 | -0/+457 |
* | | | | | | Merge branch 'rs/init-no-duplicate-real-path' | Junio C Hamano | 2014-09-02 | 1 | -4/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | init: avoid superfluous real_path() callsrs/init-no-duplicate-real-path | René Scharfe | 2014-07-28 | 1 | -4/+4 |
* | | | | | | | Merge branch 'mm/config-edit-global' | Junio C Hamano | 2014-09-02 | 5 | -10/+69 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | commit: advertise config --global --edit on guessed identitymm/config-edit-global | Matthieu Moy | 2014-07-25 | 1 | -2/+33 |
| * | | | | | | | home_config_paths(): let the caller ignore xdg path | Matthieu Moy | 2014-07-25 | 1 | -4/+6 |
| * | | | | | | | config --global --edit: create a template file if needed | Matthieu Moy | 2014-07-25 | 3 | -4/+30 |
* | | | | | | | | Merge branch 'jc/reopen-lock-file' | Junio C Hamano | 2014-09-02 | 2 | -0/+11 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | lockfile: allow reopening a closed but still locked filejc/reopen-lock-file | Junio C Hamano | 2014-07-14 | 2 | -0/+11 |
* | | | | | | | | | Merge git://github.com/git-l10n/git-po | Junio C Hamano | 2014-08-29 | 2 | -1359/+1515 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | po/TEAMS: add new members to German translation team | Ralf Thielow | 2014-08-29 | 1 | -0/+2 |
| * | | | | | | | | | l10n: de.po: translate 38 new messages | Ralf Thielow | 2014-08-29 | 1 | -1359/+1513 |
* | | | | | | | | | | Merge branch 'jk/diff-tree-t-fix' | Junio C Hamano | 2014-08-26 | 2 | -1/+45 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | intersect_paths: respect mode in git's tree-sortjk/diff-tree-t-fix | Jeff King | 2014-08-20 | 2 | -1/+45 |
* | | | | | | | | | | | Merge branch 'jk/pack-shallow-always-without-bitmap' | Junio C Hamano | 2014-08-26 | 2 | -0/+40 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | pack-objects: turn off bitmaps when we see --shallow linesjk/pack-shallow-always-without-bitmap | Jeff King | 2014-08-12 | 2 | -0/+40 |
* | | | | | | | | | | | | Merge branch 'jk/fix-profile-feedback-build' | Junio C Hamano | 2014-08-26 | 1 | -1/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Makefile: make perf tests optional for profile buildjk/fix-profile-feedback-build | Jeff King | 2014-08-19 | 1 | -1/+5 |
* | | | | | | | | | | | | | Merge git://github.com/git-l10n/git-po | Junio C Hamano | 2014-08-25 | 9 | -9039/+21279 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | l10n: de.po: improve message when switching branches | Ralf Thielow | 2014-08-23 | 1 | -3/+3 |
| * | | | | | | | | | | | | l10n: de.po: fix typo | Ralf Thielow | 2014-08-23 | 1 | -2/+2 |
| * | | | | | | | | | | | | po/TEAMS: Add Catalan team | Alex Henrie | 2014-08-22 | 1 | -0/+4 |
| * | | | | | | | | | | | | l10n: Add Catalan translation | Alex Henrie | 2014-08-22 | 1 | -0/+10951 |
| * | | | | | | | | | | | | l10n: fr.po (2257t) update for version 2.1.0 | Jean-Noel Avila | 2014-08-07 | 1 | -1353/+1518 |
| * | | | | | | | | | | | | Merge remote-tracking branch 'l10n/vi/vnwildman/master' | Jiang Xin | 2014-08-05 | 1 | -1350/+1503 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | l10n: vi.po (2257t): Update translation | Tran Ngoc Quan | 2014-08-05 | 1 | -1350/+1503 |