Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fetch: if not fetching from default remote, ignore default merge | Johannes Schindelin | 2007-10-16 | 2 | -2/+10 |
* | Merge branch 'master' into db/fetch-pack | Shawn O. Pearce | 2007-10-16 | 16 | -25/+943 |
|\ | |||||
| * | Merge branch 'maint' | Shawn O. Pearce | 2007-10-15 | 2 | -2/+1 |
| |\ | |||||
| | * | Clean up "git log" format with DIFF_FORMAT_NO_OUTPUT | Linus Torvalds | 2007-10-15 | 2 | -2/+1 |
| * | | Add a --dry-run option to git-push. | Brian Ewins | 2007-10-15 | 1 | -0/+10 |
| * | | fix t5403-post-checkout-hook.sh: built-in test in dash does not have "==" | Alex Riesen | 2007-10-15 | 1 | -4/+4 |
| * | | Merge branch 'mv/unknown' | Junio C Hamano | 2007-10-03 | 2 | -10/+2 |
| |\ \ | |||||
| | * | | Don't use "<unknown>" for placeholders and suppress printing of empty user fo... | Michal Vitecek | 2007-09-26 | 2 | -10/+2 |
| * | | | Merge branch 'ph/strbuf' | Junio C Hamano | 2007-10-03 | 1 | -6/+9 |
| |\ \ \ | |||||
| | * \ \ | Merge branch 'master' into ph/strbuf | Junio C Hamano | 2007-09-18 | 9 | -8/+508 |
| | |\ \ \ | |||||
| | * | | | | archive: fix subst file generation | René Scharfe | 2007-09-13 | 1 | -6/+9 |
| * | | | | | Merge branch 'lh/merge' | Junio C Hamano | 2007-10-03 | 1 | -0/+440 |
| |\ \ \ \ \ | |||||
| | * | | | | | git-merge: add --ff and --no-ff options | Lars Hjemli | 2007-09-23 | 1 | -0/+20 |
| | * | | | | | git-merge: add support for --commit and --no-squash | Lars Hjemli | 2007-09-23 | 1 | -0/+22 |
| | * | | | | | git-merge: add support for branch.<name>.mergeoptions | Lars Hjemli | 2007-09-23 | 1 | -0/+54 |
| | * | | | | | Add test-script for git-merge porcelain | Lars Hjemli | 2007-09-23 | 1 | -0/+344 |
| | | |/ / / | | |/| | | | |||||
| * | | | | | Merge branch 'js/rebase-i' | Junio C Hamano | 2007-10-03 | 1 | -0/+8 |
| |\ \ \ \ \ | |||||
| | * | | | | | rebase -i: work on a detached HEAD | Johannes Schindelin | 2007-09-26 | 1 | -0/+8 |
| | | |_|/ / | | |/| | | | |||||
| * | | | | | Merge branch 'je/hooks' | Junio C Hamano | 2007-10-03 | 1 | -0/+74 |
| |\ \ \ \ \ | |||||
| | * | | | | | post-checkout hook, tests, and docs | Josh England | 2007-09-29 | 1 | -0/+74 |
| * | | | | | | Merge branch 'ap/dateformat' | Junio C Hamano | 2007-10-03 | 1 | -0/+151 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Add a test script for for-each-ref, including test of date formatting | Andy Parkins | 2007-10-03 | 1 | -0/+151 |
| | |/ / / / / | |||||
| * | | | | | | Sync with GIT 1.5.3.4 | Junio C Hamano | 2007-10-03 | 1 | -0/+71 |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||||
| | * | | | | | Add test case for ls-files --with-tree | Carl Worth | 2007-10-03 | 1 | -0/+71 |
| * | | | | | | Merge branch 'maint' | Junio C Hamano | 2007-09-29 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | |/ / / / / | | | / / / / | | |/ / / / | |/| | | | | |||||
| | * | | | | rebase -i: squash should retain the authorship of the _first_ commit | Johannes Schindelin | 2007-09-29 | 1 | -1/+1 |
| * | | | | | Merge branch 'sv/svn' | Junio C Hamano | 2007-09-29 | 2 | -4/+6 |
| |\ \ \ \ \ | |||||
| | * | | | | | git-svn: handle changed svn command-line syntax | Sam Vilain | 2007-09-21 | 1 | -2/+4 |
| | * | | | | | git-svn: fix test for trunk svn (transaction out of date) | Sam Vilain | 2007-09-21 | 1 | -0/+1 |
| | * | | | | | git-svn: fix test for trunk svn (commit message not needed) | Sam Vilain | 2007-09-21 | 1 | -2/+1 |
| | | |_|/ / | | |/| | | | |||||
| * | | | | | Merge branch 'jb/remote-rm' | Junio C Hamano | 2007-09-29 | 1 | -0/+100 |
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| | * | | | | git-remote rm: add tests and minor fix-ups | Junio C Hamano | 2007-09-23 | 1 | -0/+100 |
| | |/ / / | |||||
| * | | | | rebase -i: commit when continuing after "edit" | Johannes Schindelin | 2007-09-25 | 1 | -1/+13 |
| * | | | | Merge branch 'maint' | Junio C Hamano | 2007-09-25 | 1 | -1/+1 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | Fixed minor typo in t/t9001-send-email.sh test command line. | Glenn Rempe | 2007-09-24 | 1 | -1/+1 |
| * | | | | Add post-merge hook, related documentation, and tests. | Josh England | 2007-09-18 | 1 | -0/+56 |
| | |/ / | |/| | | |||||
* | | | | Added a test for fetching remote tags when there is not tags. | Väinö Järvelä | 2007-10-15 | 1 | -0/+12 |
* | | | | fetch/push: readd rsync support | Johannes Schindelin | 2007-10-01 | 1 | -0/+35 |
* | | | | Correct handling of branch.$name.merge in builtin-fetch | Shawn O. Pearce | 2007-09-19 | 8 | -0/+10 |
* | | | | Don't attempt to merge non-existant remotes in t5515 | Shawn O. Pearce | 2007-09-19 | 1 | -2/+1 |
* | | | | Make fetch a builtin | Daniel Barkalow | 2007-09-19 | 10 | -10/+10 |
|/ / / | |||||
* | | | Merge branch 'maint' | Junio C Hamano | 2007-09-18 | 2 | -2/+15 |
|\ \ \ | |/ / | |||||
| * | | t/t4014: test "am -3" with mode-only change. | Junio C Hamano | 2007-09-18 | 1 | -2/+5 |
| * | | git-push: documentation and tests for pushing only branches | Jeff King | 2007-09-18 | 1 | -0/+10 |
| * | | git-commit: partial commit of paths only removed from the index | Junio C Hamano | 2007-09-17 | 1 | -2/+13 |
| * | | git-commit: Allow partial commit of file removal. | Junio C Hamano | 2007-09-17 | 1 | -0/+21 |
| * | | Merge branch 'jc/grep-c' into maint | Junio C Hamano | 2007-09-17 | 1 | -0/+4 |
| |\ \ | |||||
* | \ \ | Merge branch 'cr/reset' | Junio C Hamano | 2007-09-18 | 1 | -0/+405 |
|\ \ \ \ | |||||
| * | | | | An additional test for "git-reset -- path" | Junio C Hamano | 2007-09-13 | 1 | -0/+16 |
| * | | | | Add tests for documented features of "git reset". | Carlos Rica | 2007-09-12 | 1 | -0/+389 |