Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'lh/merge' | Junio C Hamano | 2007-10-03 | 3 | -0/+27 |
|\ | |||||
| * | git-merge: add --ff and --no-ff options | Lars Hjemli | 2007-09-23 | 1 | -0/+9 |
| * | git-merge: add support for --commit and --no-squash | Lars Hjemli | 2007-09-23 | 1 | -0/+8 |
| * | git-merge: add support for branch.<name>.mergeoptions | Lars Hjemli | 2007-09-23 | 2 | -0/+10 |
* | | Merge branch 'jc/autogc' | Junio C Hamano | 2007-10-03 | 2 | -1/+28 |
|\ \ | |||||
| * | | git-gc --auto: run "repack -A -d -l" as necessary. | Junio C Hamano | 2007-09-17 | 2 | -1/+12 |
| * | | git-gc --auto: add documentation. | Junio C Hamano | 2007-09-17 | 2 | -1/+17 |
* | | | Merge branch 'je/hooks' | Junio C Hamano | 2007-10-03 | 1 | -0/+14 |
|\ \ \ | |||||
| * | | | post-checkout hook, tests, and docs | Josh England | 2007-09-29 | 1 | -0/+14 |
* | | | | Merge branch 'ap/dateformat' | Junio C Hamano | 2007-10-03 | 1 | -0/+5 |
|\ \ \ \ | |||||
| * | | | | Make for-each-ref's grab_date() support per-atom formatting | Andy Parkins | 2007-09-29 | 1 | -0/+5 |
| |/ / / | |||||
* | | | | Sync with GIT 1.5.3.4 | Junio C Hamano | 2007-10-03 | 5 | -14/+42 |
|\ \ \ \ | |||||
| * | | | | GIT 1.5.3.4v1.5.3.4 | Junio C Hamano | 2007-10-03 | 1 | -10/+17 |
| * | | | | Note that git-branch will not automatically checkout the new branch | Federico Mena Quintero | 2007-10-02 | 1 | -0/+4 |
| * | | | | Add documentation for --track and --no-track to the git-branch docs. | Federico Mena Quintero | 2007-10-02 | 1 | -0/+15 |
| * | | | | Say when --track is useful in the git-checkout docs. | Federico Mena Quintero | 2007-10-02 | 1 | -1/+3 |
| * | | | | Fix typo in config.txt | Johannes Schindelin | 2007-10-02 | 1 | -1/+1 |
| * | | | | fixed link in documentation of diff-options | Steffen Prohaska | 2007-10-01 | 1 | -2/+2 |
* | | | | | Merge branch 'maint' | Junio C Hamano | 2007-10-01 | 3 | -7/+34 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Whip post 1.5.3.3 maintenance series into shape. | Junio C Hamano | 2007-10-01 | 2 | -6/+28 |
| * | | | | git stash: document apply's --index switch | Miklos Vajna | 2007-10-01 | 1 | -1/+6 |
* | | | | | Update stale documentation link in the k.org site | Junio C Hamano | 2007-09-30 | 1 | -0/+1 |
* | | | | | 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 'gr/smtp' | Junio C Hamano | 2007-09-29 | 1 | -0/+5 |
|\ \ \ \ | |||||
| * | | | | send-email --smtp-server-port: allow overriding the default port | Junio C Hamano | 2007-09-26 | 1 | -0/+5 |
* | | | | | Merge branch 'ml/submodule' | Junio C Hamano | 2007-09-29 | 1 | -0/+3 |
|\ \ \ \ \ | |||||
| * | | | | | git-submodule - allow a relative path as the subproject url | Mark Levedahl | 2007-09-25 | 1 | -0/+3 |
* | | | | | | Merge branch 'jb/remote-rm' | Junio C Hamano | 2007-09-29 | 1 | -0/+6 |
|\ \ \ \ \ \ | |||||
| * | | | | | | remote: document the 'rm' subcommand | James Bowes | 2007-09-18 | 1 | -0/+6 |
* | | | | | | | Sync with GIT 1.5.3.3 | Junio C Hamano | 2007-09-29 | 7 | -31/+95 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | / / / | | |_|/ / / | |/| | | | | |||||
| * | | | | | GIT 1.5.3.3v1.5.3.3 | Junio C Hamano | 2007-09-29 | 1 | -0/+37 |
| * | | | | | git-bundle: fix commandline examples in the manpage | Miklos Vajna | 2007-09-29 | 1 | -0/+8 |
| * | | | | | apply: get rid of --index-info in favor of --build-fake-ancestor | Johannes Schindelin | 2007-09-26 | 1 | -4/+7 |
| * | | | | | core-tutorial: correct URL | Randy Dunlap | 2007-09-25 | 1 | -1/+2 |
| * | | | | | Fix spelling of overridden in documentation | Shawn Bohrer | 2007-09-25 | 2 | -2/+2 |
| * | | | | | gitattributes.txt: Be more to the point in the filter driver description. | Johannes Sixt | 2007-09-25 | 1 | -5/+4 |
| * | | | | | gitattributes.txt: Remove a duplicated paragraph about 'ident' and 'crlf' int... | Johannes Sixt | 2007-09-25 | 1 | -11/+0 |
| * | | | | | user-manual: Explain what submodules are good for. | Michael Smith | 2007-09-25 | 1 | -12/+42 |
* | | | | | | Move convert-objects to contrib. | Matt Kraai | 2007-09-25 | 2 | -29/+0 |
| |_|/ / / |/| | | | | |||||
* | | | | | Start RelNotes for 1.5.4 | Junio C Hamano | 2007-09-24 | 1 | -0/+21 |
* | | | | | Merge branch 'je/hooks' | Junio C Hamano | 2007-09-23 | 1 | -0/+13 |
|\ \ \ \ \ | |||||
| * | | | | | Added example hook script to save/restore permissions/ownership. | Josh England | 2007-09-18 | 1 | -1/+2 |
| * | | | | | Add post-merge hook, related documentation, and tests. | Josh England | 2007-09-18 | 1 | -0/+12 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'js/apply-build-ancestor' | Junio C Hamano | 2007-09-23 | 1 | -4/+7 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | apply: get rid of --index-info in favor of --build-fake-ancestor | Johannes Schindelin | 2007-09-18 | 1 | -4/+7 |
| |/ / / | |||||
* | | | | Merge branch 'maint' | Junio C Hamano | 2007-09-23 | 4 | -13/+219 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Merge branch 'maint' of git://linux-nfs.org/~bfields/git into maint | Junio C Hamano | 2007-09-23 | 1 | -7/+213 |
| |\ \ \ | |||||
| | * | | | User Manual: add a chapter for submodules | Miklos Vajna | 2007-09-23 | 1 | -0/+202 |
| | * | | | user-manual: don't assume refs are stored under .git/refs | J. Bruce Fields | 2007-09-23 | 1 | -7/+11 |