summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* fetch: if not fetching from default remote, ignore default mergeJohannes Schindelin2007-10-162-2/+10
* Merge branch 'master' into db/fetch-packShawn O. Pearce2007-10-1616-25/+943
|\
| * Merge branch 'maint'Shawn O. Pearce2007-10-152-2/+1
| |\
| | * Clean up "git log" format with DIFF_FORMAT_NO_OUTPUTLinus Torvalds2007-10-152-2/+1
| * | Add a --dry-run option to git-push.Brian Ewins2007-10-151-0/+10
| * | fix t5403-post-checkout-hook.sh: built-in test in dash does not have "=="Alex Riesen2007-10-151-4/+4
| * | Merge branch 'mv/unknown'Junio C Hamano2007-10-032-10/+2
| |\ \
| | * | Don't use "<unknown>" for placeholders and suppress printing of empty user fo...Michal Vitecek2007-09-262-10/+2
| * | | Merge branch 'ph/strbuf'Junio C Hamano2007-10-031-6/+9
| |\ \ \
| | * \ \ Merge branch 'master' into ph/strbufJunio C Hamano2007-09-189-8/+508
| | |\ \ \
| | * | | | archive: fix subst file generationRené Scharfe2007-09-131-6/+9
| * | | | | Merge branch 'lh/merge'Junio C Hamano2007-10-031-0/+440
| |\ \ \ \ \
| | * | | | | git-merge: add --ff and --no-ff optionsLars Hjemli2007-09-231-0/+20
| | * | | | | git-merge: add support for --commit and --no-squashLars Hjemli2007-09-231-0/+22
| | * | | | | git-merge: add support for branch.<name>.mergeoptionsLars Hjemli2007-09-231-0/+54
| | * | | | | Add test-script for git-merge porcelainLars Hjemli2007-09-231-0/+344
| | | |/ / / | | |/| | |
| * | | | | Merge branch 'js/rebase-i'Junio C Hamano2007-10-031-0/+8
| |\ \ \ \ \
| | * | | | | rebase -i: work on a detached HEADJohannes Schindelin2007-09-261-0/+8
| | | |_|/ / | | |/| | |
| * | | | | Merge branch 'je/hooks'Junio C Hamano2007-10-031-0/+74
| |\ \ \ \ \
| | * | | | | post-checkout hook, tests, and docsJosh England2007-09-291-0/+74
| * | | | | | Merge branch 'ap/dateformat'Junio C Hamano2007-10-031-0/+151
| |\ \ \ \ \ \
| | * | | | | | Add a test script for for-each-ref, including test of date formattingAndy Parkins2007-10-031-0/+151
| | |/ / / / /
| * | | | | | Sync with GIT 1.5.3.4Junio C Hamano2007-10-031-0/+71
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | Add test case for ls-files --with-treeCarl Worth2007-10-031-0/+71
| * | | | | | Merge branch 'maint'Junio C Hamano2007-09-291-1/+1
| |\ \ \ \ \ \ | | |/ / / / / | | | / / / / | | |/ / / / | |/| | | |
| | * | | | rebase -i: squash should retain the authorship of the _first_ commitJohannes Schindelin2007-09-291-1/+1
| * | | | | Merge branch 'sv/svn'Junio C Hamano2007-09-292-4/+6
| |\ \ \ \ \
| | * | | | | git-svn: handle changed svn command-line syntaxSam Vilain2007-09-211-2/+4
| | * | | | | git-svn: fix test for trunk svn (transaction out of date)Sam Vilain2007-09-211-0/+1
| | * | | | | git-svn: fix test for trunk svn (commit message not needed)Sam Vilain2007-09-211-2/+1
| | | |_|/ / | | |/| | |
| * | | | | Merge branch 'jb/remote-rm'Junio C Hamano2007-09-291-0/+100
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | git-remote rm: add tests and minor fix-upsJunio C Hamano2007-09-231-0/+100
| | |/ / /
| * | | | rebase -i: commit when continuing after "edit"Johannes Schindelin2007-09-251-1/+13
| * | | | Merge branch 'maint'Junio C Hamano2007-09-251-1/+1
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Fixed minor typo in t/t9001-send-email.sh test command line.Glenn Rempe2007-09-241-1/+1
| * | | | Add post-merge hook, related documentation, and tests.Josh England2007-09-181-0/+56
| | |/ / | |/| |
* | | | Added a test for fetching remote tags when there is not tags.Väinö Järvelä2007-10-151-0/+12
* | | | fetch/push: readd rsync supportJohannes Schindelin2007-10-011-0/+35
* | | | Correct handling of branch.$name.merge in builtin-fetchShawn O. Pearce2007-09-198-0/+10
* | | | Don't attempt to merge non-existant remotes in t5515Shawn O. Pearce2007-09-191-2/+1
* | | | Make fetch a builtinDaniel Barkalow2007-09-1910-10/+10
|/ / /
* | | Merge branch 'maint'Junio C Hamano2007-09-182-2/+15
|\ \ \ | |/ /
| * | t/t4014: test "am -3" with mode-only change.Junio C Hamano2007-09-181-2/+5
| * | git-push: documentation and tests for pushing only branchesJeff King2007-09-181-0/+10
| * | git-commit: partial commit of paths only removed from the indexJunio C Hamano2007-09-171-2/+13
| * | git-commit: Allow partial commit of file removal.Junio C Hamano2007-09-171-0/+21
| * | Merge branch 'jc/grep-c' into maintJunio C Hamano2007-09-171-0/+4
| |\ \
* | \ \ Merge branch 'cr/reset'Junio C Hamano2007-09-181-0/+405
|\ \ \ \
| * | | | An additional test for "git-reset -- path"Junio C Hamano2007-09-131-0/+16
| * | | | Add tests for documented features of "git reset".Carlos Rica2007-09-121-0/+389