Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | | | Merge branch 'jn/revert-quit' | Junio C Hamano | 2011-11-22 | 10 | -54/+314 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | revert: remove --reset compatibility optionjn/revert-quit | Jonathan Nieder | 2011-11-22 | 2 | -5/+2 | |
| * | | | | | | | | | | | | | revert: introduce --abort to cancel a failed cherry-pick | Jonathan Nieder | 2011-11-22 | 5 | -3/+185 | |
| * | | | | | | | | | | | | | revert: write REVERT_HEAD pseudoref during conflicted revert | Jonathan Nieder | 2011-11-22 | 4 | -3/+61 | |
| * | | | | | | | | | | | | | revert: improve error message for cherry-pick during cherry-pick | Jonathan Nieder | 2011-11-22 | 1 | -7/+6 | |
| * | | | | | | | | | | | | | revert: rearrange pick_revisions() for clarity | Jonathan Nieder | 2011-11-22 | 1 | -24/+24 | |
| * | | | | | | | | | | | | | revert: rename --reset option to --quit | Jonathan Nieder | 2011-11-22 | 7 | -25/+49 | |
* | | | | | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2011-11-21 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | / / / / / / / / / / / | | |/ / / / / / / / / / / | |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | documentation fix: git difftool uses diff tools, not merge tools. | Thomas Hochstein | 2011-11-21 | 1 | -1/+1 | |
* | | | | | | | | | | | | | Merge branch 'rr/misc-fixes' | Junio C Hamano | 2011-11-21 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | convert.c: Fix return type of git_path_check_eol()rr/misc-fixes | Ramsay Jones | 2011-11-21 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | config.c: Fix a static buffer overwrite bug by avoiding mkpath() | Ramsay Jones | 2011-11-20 | 1 | -2/+2 | |
* | | | | | | | | | | | | | | t5501-*.sh: Fix url passed to clone in setup test | Ramsay Jones | 2011-11-20 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | Hopefully final update of release notes before 1.7.8 final | Junio C Hamano | 2011-11-18 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | Merge branch 'rr/misc-fixes' | Junio C Hamano | 2011-11-18 | 4 | -13/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | git-compat-util: don't assume value for undefined variable | Ramkumar Ramachandra | 2011-11-15 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | sha1_file: don't mix enum with int | Ramkumar Ramachandra | 2011-11-15 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | convert: don't mix enum with int | Ramkumar Ramachandra | 2011-11-15 | 1 | -3/+3 | |
| * | | | | | | | | | | | | | http: remove unused function hex() | Ramkumar Ramachandra | 2011-11-15 | 1 | -8/+0 | |
* | | | | | | | | | | | | | | Makefile: add option to disable automatic dependency generation | Jonathan Nieder | 2011-11-18 | 1 | -7/+24 | |
* | | | | | | | | | | | | | | Sync with 1.7.7.4 | Junio C Hamano | 2011-11-18 | 5 | -49/+81 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Git 1.7.7.4v1.7.7.4 | Junio C Hamano | 2011-11-18 | 3 | -2/+16 | |
| * | | | | | | | | | | | | | Merge branch 'jc/maint-name-rev-all' into maint | Junio C Hamano | 2011-11-18 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | name-rev --all: do not even attempt to describe non-commit objectjc/maint-name-rev-all | Junio C Hamano | 2011-11-15 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | Merge branch 'ml/mailmap' into maint | Junio C Hamano | 2011-11-18 | 1 | -3/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | mailmap: xcalloc mailmap_infoml/mailmap | Marc-André Lureau | 2011-11-16 | 1 | -3/+2 | |
| * | | | | | | | | | | | | | Merge branch 'jn/maint-notes-avoid-va-args' into maint | Junio C Hamano | 2011-11-18 | 1 | -43/+61 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | notes merge: eliminate OUTPUT macrojn/maint-notes-avoid-va-args | Jonathan Nieder | 2011-11-17 | 1 | -43/+61 | |
| * | | | | | | | | | | | | | | Makefile: add missing header file dependencies | Jonathan Nieder | 2011-11-18 | 1 | -2/+3 | |
* | | | | | | | | | | | | | | | do not let git_path clobber errno when reporting errorsjn/git-path-errno | Jonathan Nieder | 2011-11-17 | 2 | -24/+34 | |
* | | | | | | | | | | | | | | | Git 1.7.8-rc3v1.7.8-rc3 | Junio C Hamano | 2011-11-17 | 2 | -5/+2 | |
* | | | | | | | | | | | | | | | refs: loosen over-strict "format" check | Junio C Hamano | 2011-11-16 | 2 | -10/+17 | |
* | | | | | | | | | | | | | | | revert: prettify fatal messages | Ramkumar Ramachandra | 2011-11-15 | 1 | -5/+5 | |
* | | | | | | | | | | | | | | | Revert "upload-archive: use start_command instead of fork" | Junio C Hamano | 2011-11-15 | 4 | -31/+55 | |
| |_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Git 1.7.8-rc2v1.7.8-rc2 | Junio C Hamano | 2011-11-12 | 2 | -2/+2 | |
* | | | | | | | | | | | | | | Merge branch 'ly/mktree-using-strbuf' | Junio C Hamano | 2011-11-11 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge "Move 'builtin-*' into a 'builtin/' subdirectory"ly/mktree-using-strbuf | Junio C Hamano | 2011-11-10 | 943 | -17539/+77997 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge 'build-in git-mktree' | Junio C Hamano | 2011-11-10 | 1366 | -45469/+172869 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | mktree: fix a memory leak in write_tree() | Liu Yuan | 2011-11-10 | 1 | -0/+1 | |
* | | | | | | | | | | | | | | | | | Merge branch 'sn/complete-bash-wo-process-subst' | Junio C Hamano | 2011-11-09 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | completion: don't leak variable from the prompt into environment | SZEDER Gábor | 2011-11-09 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | Update draft release notes to 1.7.8 | Junio C Hamano | 2011-11-08 | 1 | -14/+5 | |
* | | | | | | | | | | | | | | | | | | Merge branch 'jc/remote-setbranches-usage-fix' | Junio C Hamano | 2011-11-08 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | remote: fix set-branches usagejc/remote-setbranches-usage-fix | Junio C Hamano | 2011-11-06 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'fc/remote-seturl-usage-fix' | Junio C Hamano | 2011-11-08 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | remote: fix remote set-url usagefc/remote-seturl-usage-fix | Felipe Contreras | 2011-11-06 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | | | Sync with 1.7.7.3 | Junio C Hamano | 2011-11-08 | 5 | -50/+67 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | Git 1.7.7.3v1.7.7.3 | Junio C Hamano | 2011-11-08 | 3 | -2/+21 | |
| * | | | | | | | | | | | | | | | | | | | Merge branch 'jc/maint-remove-renamed-ref' into maint | Junio C Hamano | 2011-11-08 | 1 | -8/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jm/maint-gitweb-filter-forks-fix' into maint | Junio C Hamano | 2011-11-08 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |