Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update draft release notes to 1.8.4 | Junio C Hamano | 2013-07-11 | 1 | -3/+76 |
* | Merge branch 'pb/stash-refuse-to-kill' | Junio C Hamano | 2013-07-11 | 1 | -2/+10 |
|\ | |||||
| * | git stash: avoid data loss when "git stash save" kills a directory | Petr Baudis | 2013-07-01 | 1 | -2/+10 |
* | | Merge branch 'jg/status-config' | Junio C Hamano | 2013-07-11 | 1 | -0/+8 |
|\ \ | |||||
| * | | status: introduce status.branch to enable --branch by default | Jorge Juan Garcia Garcia | 2013-06-24 | 1 | -0/+4 |
| * | | status: introduce status.short to enable --short by default | Jorge Juan Garcia Garcia | 2013-06-24 | 1 | -0/+4 |
* | | | Merge branch 'jc/triangle-push-fixup' | Junio C Hamano | 2013-07-11 | 1 | -30/+50 |
|\ \ \ | |||||
| * | | | push: change `simple` to accommodate triangular workflows | Ramkumar Ramachandra | 2013-06-24 | 1 | -3/+7 |
| * | | | config doc: rewrite push.default section | Ramkumar Ramachandra | 2013-06-24 | 1 | -28/+44 |
* | | | | Merge branch 'maint' | Junio C Hamano | 2013-07-04 | 2 | -1/+16 |
|\ \ \ \ | |||||
| * | | | | Update draft release notes to 1.8.3.3 | Junio C Hamano | 2013-07-04 | 1 | -0/+15 |
| * | | | | Merge branch 'rr/diffcore-pickaxe-doc' into maint | Junio C Hamano | 2013-07-04 | 2 | -26/+57 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'cr/git-work-tree-sans-git-dir' into maint | Junio C Hamano | 2013-07-04 | 1 | -3/+1 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'rh/merge-options-doc-fix' into maint | Junio C Hamano | 2013-07-04 | 1 | -1/+2 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'an/diff-index-doc' into maint | Junio C Hamano | 2013-07-04 | 1 | -6/+6 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'maint-1.8.2' into maint | Junio C Hamano | 2013-07-04 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge branch 'maint-1.8.1' into maint-1.8.2 | Junio C Hamano | 2013-07-04 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | git-config: update doc for --get with multiple values | John Keeping | 2013-07-03 | 1 | -1/+1 |
* | | | | | | | | | | | Update draft release notes to 1.8.4 | Junio C Hamano | 2013-07-01 | 1 | -0/+16 |
* | | | | | | | | | | | Merge branch 'rr/remote-branch-config-refresh' | Junio C Hamano | 2013-07-01 | 1 | -6/+5 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | ls-remote doc: don't encourage use of branches-file | Ramkumar Ramachandra | 2013-06-23 | 1 | -2/+2 |
| * | | | | | | | | | | | ls-remote doc: rewrite <repository> paragraph | Ramkumar Ramachandra | 2013-06-23 | 1 | -3/+3 |
| * | | | | | | | | | | | ls-remote doc: fix example invocation on git.git | Ramkumar Ramachandra | 2013-06-23 | 1 | -1/+0 |
* | | | | | | | | | | | | Merge branch 'ap/rebase-multiple-fixups' | Junio C Hamano | 2013-07-01 | 1 | -1/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | rebase -i: handle fixup! fixup! in --autosquash | Andrew Pimlott | 2013-06-27 | 1 | -1/+3 |
* | | | | | | | | | | | | | Merge branch 'kb/am-deprecate-resolved' | Junio C Hamano | 2013-07-01 | 2 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | am: replace uses of --resolved with --continue | Kevin Bracey | 2013-06-27 | 2 | -3/+3 |
* | | | | | | | | | | | | | | Merge branch 'rr/column-doc' | Junio C Hamano | 2013-07-01 | 1 | -3/+17 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | column doc: rewrite documentation for column.ui | Ramkumar Ramachandra | 2013-06-26 | 1 | -3/+17 |
* | | | | | | | | | | | | | | | Merge branch 'ft/doc-git-transport' | Junio C Hamano | 2013-07-01 | 1 | -0/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | documentation: add git:// transport security notice | Fraser Tweedale | 2013-06-26 | 1 | -0/+3 |
| |/ / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | Merge branch 'wk/doc-in-linux-3.x-era' | Junio C Hamano | 2013-07-01 | 5 | -40/+46 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | Documentation: Update 'linux-2.6.git' -> 'linux.git' | W. Trevor King | 2013-06-23 | 4 | -10/+10 |
| * | | | | | | | | | | | | | | | Documentation: Update the NFS remote examples to use the staging repo | W. Trevor King | 2013-06-23 | 2 | -19/+32 |
| * | | | | | | | | | | | | | | | doc/clone: Pick more compelling paths for the --reference example | W. Trevor King | 2013-06-23 | 1 | -4/+4 |
| * | | | | | | | | | | | | | | | doc/clone: Remove the '--bare -l -s' example | W. Trevor King | 2013-06-23 | 1 | -7/+0 |
| | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Merge branch 'jc/topo-author-date-sort' | Junio C Hamano | 2013-07-01 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | log: --author-date-order | Junio C Hamano | 2013-06-12 | 1 | -0/+4 |
* | | | | | | | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2013-07-01 | 2 | -1/+12 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Start preparing for 1.8.3.3 | Junio C Hamano | 2013-07-01 | 1 | -0/+11 |
| * | | | | | | | | | | | | | | | check-ignore doc: fix broken link to ls-files page | Ramkumar Ramachandra | 2013-06-30 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | Update draft release notes to 1.8.4 | Junio C Hamano | 2013-07-01 | 1 | -0/+23 |
* | | | | | | | | | | | | | | | | Merge branch 'ap/diff-ignore-blank-lines' | Junio C Hamano | 2013-07-01 | 1 | -0/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | diff: add --ignore-blank-lines option | Antoine Pelisse | 2013-06-20 | 1 | -0/+3 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | Merge branch 'nk/name-rev-abbreviated-refs' | Junio C Hamano | 2013-07-01 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | name-rev: allow to specify a subpath for --refs option | Namhyung Kim | 2013-06-18 | 1 | -1/+2 |
| |/ / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | Merge branch 'jk/submodule-subdirectory-ok' | Junio C Hamano | 2013-07-01 | 1 | -0/+16 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | rev-parse: add --prefix option | John Keeping | 2013-06-17 | 1 | -0/+16 |
| |/ / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | Sync with 1.8.3.2 | Junio C Hamano | 2013-06-28 | 2 | -1/+7 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Git 1.8.3.2v1.8.3.2 | Junio C Hamano | 2013-06-28 | 2 | -1/+7 |