summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | clean: require double -f options to nuke nested git repository and work treeJunio C Hamano2009-07-296-5/+63
* | | | | | | | | | | | | Merge branch 'jk/maint-merge-msg-fix' into maintJunio C Hamano2009-08-264-11/+75
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | merge: indicate remote tracking branches in merge messageJeff King2009-08-093-1/+16
| * | | | | | | | | | | | | merge: fix incorrect merge message for ambiguous tag/branchJeff King2009-08-093-11/+10
| * | | | | | | | | | | | | add tests for merge message headingsJeff King2009-08-091-0/+50
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'jc/apply-epoch-patch' into maintJunio C Hamano2009-08-262-1/+176
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | apply: notice creation/removal patches produced by GNU diffJunio C Hamano2009-07-112-1/+176
* | | | | | | | | | | | | | Merge branch 'jp/symlink-dirs' into maintJunio C Hamano2009-08-264-1/+114
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | t6035-merge-dir-to-symlink depends on SYMLINKS prerequisiteJohannes Sixt2009-08-091-0/+6
| | |_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | git-checkout: be careful about untracked symlinksLinus Torvalds2009-07-293-2/+18
| * | | | | | | | | | | | | lstat_cache: guard against full match of length of 'name' parameterKjetil Barvik2009-07-292-1/+5
| * | | | | | | | | | | | | Demonstrate bugs when a directory is replaced with a symlinkPickens, James E2009-07-291-0/+87
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'maint-1.6.3' into maintJunio C Hamano2009-08-262-0/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'tr/maint-1.6.3-add-p-modeonly-fix' into maint-1.6.3Junio C Hamano2009-08-262-0/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |
| | * | | | | | | | | | | add -p: do not attempt to coalesce mode changesThomas Rast2009-08-152-1/+5
| | * | | | | | | | | | | git add -p: demonstrate failure when staging both mode and hunkKirill Smelkov2009-08-151-0/+11
* | | | | | | | | | | | | GIT 1.6.4.1v1.6.4.1Junio C Hamano2009-08-214-3/+50
* | | | | | | | | | | | | Merge branch 'bc/maint-am-email' into maintJunio C Hamano2009-08-212-1/+34
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | git-am: print fair error message when format detection failsNicolas Sebrecht2009-08-101-1/+5
| * | | | | | | | | | | | | am: allow individual e-mail files as inputJunio C Hamano2009-08-102-0/+29
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'jc/maint-merge-recursive-fix' into maintJunio C Hamano2009-08-212-3/+80
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | merge-recursive: don't segfault while handling rename clashesJunio C Hamano2009-07-302-3/+80
* | | | | | | | | | | | | | Merge branch 'zf/maint-gitweb-acname' into maintJunio C Hamano2009-08-211-3/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | gitweb: parse_commit_text encoding fixZoltán Füzesi2009-08-051-3/+2
| | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'np/maint-limit-delta-cache' into maintJunio C Hamano2009-08-212-4/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | don't let the delta cache grow unbounded in 'git repack'Nicolas Pitre2009-08-052-4/+12
* | | | | | | | | | | | | | | Merge branch 'jk/maint-show-tag' into maintJunio C Hamano2009-08-211-1/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | show: add space between multiple itemsJeff King2009-07-191-0/+6
| * | | | | | | | | | | | | | | show: suppress extra newline when showing annotated tagJeff King2009-07-191-1/+1
* | | | | | | | | | | | | | | | Merge branch 'sb/maint-pull-rebase' into maintJunio C Hamano2009-08-212-3/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | pull: support rebased upstream + fetch + pull --rebaseSanti Béjar2009-07-192-6/+13
| * | | | | | | | | | | | | | | | t5520-pull: Test for rebased upstream + fetch + pull --rebaseSanti Béjar2009-07-191-0/+14
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | filter-branch: make the usage string fit on 80 chars terminals.Matthieu Moy2009-08-181-6/+6
* | | | | | | | | | | | | | | | filter-branch: add an example how to add ACKs to a range of commitsJohannes Schindelin2009-08-181-0/+10
| |_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | docs: describe impact of repack on "clone -s"Jeff King2009-08-171-2/+10
* | | | | | | | | | | | | | | Merge branch 'maint-1.6.3' into maintJunio C Hamano2009-08-129-12/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Change mentions of "git programs" to "git commands"Ori Avtalion2009-08-128-10/+10
| * | | | | | | | | | | | | | Documentation: merge: one <remote> is requiredPaul Bolle2009-08-121-1/+1
| * | | | | | | | | | | | | | help.c: give correct structure's size to memset()Johan Herland2009-08-121-1/+1
* | | | | | | | | | | | | | | push: point to 'git pull' and 'git push --force' in case of non-fast forwardMatthieu Moy2009-08-124-5/+103
* | | | | | | | | | | | | | | Documentation: add: <filepattern>... is optionalPaul Bolle2009-08-121-1/+1
* | | | | | | | | | | | | | | Merge branch 'maint-1.6.3' into maintJunio C Hamano2009-08-102-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Fix typos in git-remote.txt and git-symbolic-ref.txtŠtěpán Němec2009-08-102-4/+4
* | | | | | | | | | | | | | | git-instaweb: fix mod_perl detection for apache2Mark A Rada2009-08-091-1/+1
| |_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'maint-1.6.3' into maintJunio C Hamano2009-08-072-11/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | / / / / / / / / / / / | |_|/ / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'maint-1.6.2' into maint-1.6.3Junio C Hamano2009-08-072-11/+27
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Merge branch 'maint-1.6.1' into maint-1.6.2Junio C Hamano2009-08-072-11/+27
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-08-072-11/+27
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / | | | |/| | | | | / / / / | | | | | |_|_|_|/ / / / | | | | |/| | | | | | |
| | | | * | | | | | | | verify-pack -v: do not report "chain length 0"Junio C Hamano2009-08-071-8/+19
| | | | * | | | | | | | t5510: harden the way verify-pack is usedJunio C Hamano2009-08-071-3/+8