aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
| * | | | | | | | | | | | | | | git-p4: handle files with shell metacharactersLuke Diamand2011-10-17
| * | | | | | | | | | | | | | | git-p4: keyword flattening fixesPete Wyckoff2011-10-17
| * | | | | | | | | | | | | | | git-p4: stop ignoring apple filetypePete Wyckoff2011-10-17
| * | | | | | | | | | | | | | | git-p4: recognize all p4 filetypesPete Wyckoff2011-10-17
| * | | | | | | | | | | | | | | git-p4: handle utf16 filetype properlyPete Wyckoff2011-10-17
| * | | | | | | | | | | | | | | git-p4 tests: refactor and cleanupPete Wyckoff2011-10-17
* | | | | | | | | | | | | | | | Merge branch 'cn/doc-config-bare-subsection'Junio C Hamano2011-10-21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Documentation: update [section.subsection] to reflect what git doesCarlos Martín Nieto2011-10-16
* | | | | | | | | | | | | | | | | Merge branch 'jk/maint-pack-objects-compete-with-delete'Junio C Hamano2011-10-21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | downgrade "packfile cannot be accessed" errors to warningsJeff King2011-10-14
| * | | | | | | | | | | | | | | | | pack-objects: protect against disappearing packsJeff King2011-10-14
| | |_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'jk/daemon-msgs'Junio C Hamano2011-10-21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | daemon: give friendlier error messages to clientsJeff King2011-10-15
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge branch 'sc/difftool-skip'Junio C Hamano2011-10-21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | t7800: avoid arithmetic expansion notationJunio C Hamano2011-10-14
| * | | | | | | | | | | | | | | | | git-difftool: allow skipping file by typing 'n' at promptSitaram Chamarty2011-10-10
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge branch 'jc/unseekable-bundle'Junio C Hamano2011-10-21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | bundle: add parse_bundle_header() helper functionJunio C Hamano2011-10-13
| * | | | | | | | | | | | | | | | | bundle: allowing to read from an unseekable fdJunio C Hamano2011-10-13
* | | | | | | | | | | | | | | | | | Merge branch 'ph/transport-with-gitfile'Junio C Hamano2011-10-21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Fix is_gitfile() for files too small or larger than PATH_MAX to be a gitfileJohannes Schindelin2011-10-11
| * | | | | | | | | | | | | | | | | | Add test showing git-fetch groks gitfilesPhil Hord2011-10-04
| * | | | | | | | | | | | | | | | | | Teach transport about the gitfile mechanismPhil Hord2011-10-04
| * | | | | | | | | | | | | | | | | | Learn to handle gitfiles in enter_repoPhil Hord2011-10-04
| * | | | | | | | | | | | | | | | | | enter_repo: do not modify inputErik Faye-Lund2011-10-04
| | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Sync with maintJunio C Hamano2011-10-21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Almost ready for 1.7.7.1Junio C Hamano2011-10-21
| * | | | | | | | | | | | | | | | | Merge branch 'nd/maint-autofix-tag-in-head' into maintJunio C Hamano2011-10-21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/apply-blank-at-eof-fix' into maintJunio C Hamano2011-10-21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jn/no-g-plus-s-on-bsd' into maintJunio C Hamano2011-10-21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/diff-cleanup-records-fix' into maintJunio C Hamano2011-10-21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'il/archive-err-signal' into maintJunio C Hamano2011-10-21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/maint-merge-one-file-osx-expr' into maintJunio C Hamano2011-10-21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jm/maint-apply-detects-corrupt-patch-header' into maintJunio C Hamano2011-10-21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/checkout-from-tree-keep-local-changes' into maintJunio C Hamano2011-10-21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mm/maint-config-explicit-bool-display' into maintJunio C Hamano2011-10-21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | | | | tests: add missing executable bitsJeff King2011-10-20
* | | | | | | | | | | | | | | | | | | | | | | | | | | Update draft release notes to 1.7.8Junio C Hamano2011-10-19
* | | | | | | | | | | | | | | | | | | | | | | | | | | t/t3000-ls-files-others.sh: use $SHELL_PATH to run git-new-workdir scriptBrandon Casey2011-10-19
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/merge-edit-option'Junio C Hamano2011-10-19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Teach merge the '[-e|--edit]' optionJay Soffian2011-10-12
| | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/diff-whole-function'Junio C Hamano2011-10-19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | diff: add option to show whole functions as contextRené Scharfe2011-10-10
| * | | | | | | | | | | | | | | | | | | | | | | | | | | xdiff: factor out get_func_line()René Scharfe2011-10-10
| |/ / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/pickaxe'Junio C Hamano2011-10-19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | pickaxe: factor out pickaxeRené Scharfe2011-10-07
| * | | | | | | | | | | | | | | | | | | | | | | | | | | pickaxe: give diff_grep the same signature as has_changesRené Scharfe2011-10-07
| * | | | | | | | | | | | | | | | | | | | | | | | | | | pickaxe: pass diff_options to contains and has_changesRené Scharfe2011-10-07
| * | | | | | | | | | | | | | | | | | | | | | | | | | | pickaxe: factor out has_changesRené Scharfe2011-10-07
| * | | | | | | | | | | | | | | | | | | | | | | | | | | pickaxe: plug regex/kws leakRené Scharfe2011-10-07