aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-04-05
|\
| * commit: abort commit if interactive add failedJeff King2009-04-05
| * git-repack: use non-dashed update-server-infoDan McGee2009-04-05
* | Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-04-01
|\ \ | |/
| * Documentation: Remove an odd "instead"Holger Weiß2009-04-01
* | Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-03-30
|\ \ | |/
| * Fix bash completion in path with spacesDaniel Cheng (aka SDiZ)2009-03-30
| * bash completion: only show 'log --merge' if mergingThomas Rast2009-03-30
| * git-tag(1): add hint about commit messagesNico -telmich- Schottelius2009-03-30
| * Documentation: update graph api example.Allan Caffee2009-03-30
* | Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-03-29
|\ \ | |/
| * import-zips: fix thinkoJohannes Schindelin2009-03-29
* | test-lib: Clean up comments and Makefile.Emil Sit2009-03-28
* | diff --no-index: Do not generate patch output if other output is requestedJohannes Sixt2009-03-25
* | Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-03-24
|\ \ | |/
| * close_sha1_file(): make it easier to diagnose errorsLinus Torvalds2009-03-24
| * avoid possible overflow in delta size filtering computationNicolas Pitre2009-03-24
* | Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-03-22
|\ \ | |/
| * everyday: use the dashless form of git-initDavid Aguilar2009-03-22
* | Merge branch 'js/maint-1.6.0-path-normalize' into maint-1.6.1Junio C Hamano2009-03-21
|\ \
| * | Remove unused normalize_absolute_path()Johannes Sixt2009-02-07
| * | Test and fix normalize_path_copy()Johannes Sixt2009-02-07
| * | Fix GIT_CEILING_DIRECTORIES on WindowsRené Scharfe2009-02-07
| * | Move sanitary_path_copy() to path.c and rename it to normalize_path_copy()Johannes Sixt2009-02-07
| * | Make test-path-utils more robust against incorrect useJohannes Sixt2009-02-07
* | | Merge branch 'jc/maint-1.6.0-pack-directory' into maint-1.6.1Junio C Hamano2009-03-21
|\ \ \
| * | | Fix odb_mkstemp() on AIXMike Ralphson2009-02-26
| * | | Make sure objects/pack exists before creating a new packJunio C Hamano2009-02-25
* | | | Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-03-12
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'ks/maint-1.6.0-mailinfo-folded' into maint-1.6.0Junio C Hamano2009-03-12
| |\ \ \
| * \ \ \ Merge branch 'cc/maint-1.6.0-bisect-fix' into maint-1.6.0Junio C Hamano2009-03-12
| |\ \ \ \
| | * | | | bisect: fix another instance of eval'ed stringChristian Couder2009-02-27
| | * | | | bisect: fix quoting TRIED revs when "bad" commit is also "skip"pedChristian Couder2009-02-27
| | | |/ / | | |/| |
| * | | | Merge branch 'fg/maint-1.6.0-exclude-bq' into maint-1.6.0Junio C Hamano2009-03-12
| |\ \ \ \
| | * | | | Support "\" in non-wildcard exclusion entriesFinn Arne Gangstad2009-02-12
| | | |_|/ | | |/| |
| * | | | Merge branch 'jc/maint-1.6.0-split-diff-metainfo' into maint-1.6.0Junio C Hamano2009-03-12
| |\ \ \ \
* | \ \ \ \ Merge branch 'en/maint-1.6.1-hash-object' into maint-1.6.1Junio C Hamano2009-03-12
|\ \ \ \ \ \
| * | | | | | Ensure proper setup of git_dir for git-hash-objectElijah Newren2009-02-28
* | | | | | | Merge branch 'js/maint-1.6.1-filter-branch-submodule' into maint-1.6.1Junio C Hamano2009-03-12
|\ \ \ \ \ \ \
| * | | | | | | filter-branch: do not consider diverging submodules a 'dirty worktree'Johannes Schindelin2009-02-05
* | | | | | | | Merge branch 'gt/maint-1.6.1-utf8-width' into maint-1.6.1Junio C Hamano2009-03-12
|\ \ \ \ \ \ \ \
| * | | | | | | | builtin-blame.c: Use utf8_strwidth for author's namesGeoffrey Thomas2009-02-04
| * | | | | | | | utf8: add utf8_strwidth()Geoffrey Thomas2009-02-04
* | | | | | | | | Merge branch 'js/maint-1.6.1-remote-remove-mirror' into maint-1.6.1Junio C Hamano2009-03-12
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | builtin-remote: make rm operation safer in mirrored repositoryJay Soffian2009-02-04
| * | | | | | | | | builtin-remote: make rm() use properly named variable to hold return valueJay Soffian2009-02-03
* | | | | | | | | | Merge branch 'ek/maint-1.6.1-filter-branch-bare' into maint-1.6.1Junio C Hamano2009-03-12
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | filter-branch: Fix fatal error on bare repositoriesEric Kidd2009-02-03
* | | | | | | | | | Merge branch 'jc/maint-1.6.1-add-u-remove-conflicted' into maint-1.6.1Junio C Hamano2009-03-12
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | add -u: do not fail to resolve a path as deletedJunio C Hamano2009-01-28