aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* mergetool: Provide an empty file when neededDavid Aguilar2012-01-23
* Merge branch 'jm/mergetool-pathspec'Junio C Hamano2011-10-10
|\
| * mergetool: no longer need to save standard inputJunio C Hamano2011-09-26
| * mergetool: Use args as pathspec to unmerged filesJonathon Mah2011-09-26
* | Merge branch 'jc/maint-diffstat-numstat-context'Junio C Hamano2011-10-10
|\ \
| * | diff: teach --stat/--numstat to honor -U$numJunio C Hamano2011-09-22
* | | Merge branch 'mz/remote-rename'Junio C Hamano2011-10-10
|\ \ \
| * | | remote: only update remote-tracking branch if updating refspecMartin von Zweigbergk2011-09-11
| * | | remote rename: warn when refspec was not updatedMartin von Zweigbergk2011-09-11
| * | | remote: "rename o foo" should not rename ref "origin/bar"Martin von Zweigbergk2011-09-11
| * | | remote: write correct fetch spec when renaming remote 'remote'Martin von Zweigbergk2011-09-11
* | | | Merge branch 'cb/common-prefix-unification'Junio C Hamano2011-10-10
|\ \ \ \
| * | | | rename pathspec_prefix() to common_prefix() and move to dir.[ch]Clemens Buchacher2011-09-12
| * | | | consolidate pathspec_prefix and common_prefixJunio C Hamano2011-09-06
| * | | | remove prefix argument from pathspec_prefixClemens Buchacher2011-09-06
* | | | | Merge branch 'jn/maint-http-error-message'Junio C Hamano2011-10-10
|\ \ \ \ \
| * | | | | http: avoid empty error messages for some curl errorsJonathan Nieder2011-09-06
| * | | | | http: remove extra newline in error messageJonathan Nieder2011-09-06
| | |/ / / | |/| | |
* | | | | Merge branch 'hv/submodule-update-none'Junio C Hamano2011-10-10
|\ \ \ \ \
| * | | | | add update 'none' flag to disable update of submodule by defaultHeiko Voigt2011-08-11
| * | | | | submodule: move update configuration variable further upHeiko Voigt2011-08-11
* | | | | | Merge branch 'fg/submodule-git-file-git-dir'Junio C Hamano2011-10-10
|\ \ \ \ \ \
| * | | | | | Move git-dir for submodulesFredrik Gustafsson2011-08-22
| * | | | | | rev-parse: add option --resolve-git-dir <path>Fredrik Gustafsson2011-08-16
* | | | | | | Fix some "variable might be used uninitialized" warningsRamsay Jones2011-10-09
* | | | | | | Makefile: fix permissions of mergetools/ checked out with permissive umaskJunio C Hamano2011-10-09
|\ \ \ \ \ \ \
| * | | | | | | Makefile: fix permissions of mergetools/ checked out with permissive umaskJonathan Nieder2011-10-09
* | | | | | | | Post 1.7.7 first waveJunio C Hamano2011-10-05
* | | | | | | | Merge branch 'mm/mediawiki-as-a-remote'Junio C Hamano2011-10-05
|\ \ \ \ \ \ \ \
| * | | | | | | | git-remote-mediawiki: allow a domain to be set for authenticationMatthieu Moy2011-09-28
| * | | | | | | | git-remote-mediawiki: obey advice.pushNonFastForwardMatthieu Moy2011-09-27
| * | | | | | | | git-remote-mediawiki: set 'basetimestamp' to let the wiki handle conflictsMatthieu Moy2011-09-27
| * | | | | | | | git-remote-mediawiki: trivial fixesMatthieu Moy2011-09-27
| * | | | | | | | git-remote-mediawiki: allow push to set MediaWiki metadataMatthieu Moy2011-09-01
| * | | | | | | | Add a remote helper to interact with mediawiki (fetch & push)Jeremie Nikaes2011-09-01
* | | | | | | | | Merge branch 'js/check-attr-cached'Junio C Hamano2011-10-05
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t0003: remove extra whitespacesJunio C Hamano2011-09-22
| * | | | | | | | | Teach '--cached' option to check-attrJay Soffian2011-09-22
* | | | | | | | | | Merge branch 'rj/maint-t9159-svn-rev-notation'Junio C Hamano2011-10-05
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | t9159-*.sh: skip for mergeinfo test for svn <= 1.4Ramsay Jones2011-09-21
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'cn/eradicate-working-copy'Junio C Hamano2011-10-05
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove 'working copy' from the documentation and C codeCarlos Martín Nieto2011-09-21
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jn/gitweb-highlite-sanitise'Junio C Hamano2011-10-05
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | gitweb: Strip non-printable characters from syntax highlighter outputJakub Narebski2011-09-16
* | | | | | | | | | | Merge branch 'jc/ls-remote-short-help'Junio C Hamano2011-10-05
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | ls-remote: a lone "-h" is asking for helpJunio C Hamano2011-09-16
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'sn/doc-update-index-assume-unchanged'Junio C Hamano2011-10-05
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Documentation/git-update-index: refer to 'ls-files'Stefan Naewe2011-09-21
* | | | | | | | | | | | Merge branch 'mg/maint-doc-sparse-checkout'Junio C Hamano2011-10-05
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | git-read-tree.txt: correct sparse-checkout and skip-worktree descriptionMichael J Gruber2011-09-21