Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jk/remove-remote-helpers-in-python' | Junio C Hamano | 2013-09-17 | 16 | -1815/+0 |
|\ | |||||
| * | git_remote_helpers: remove little used Python libraryjk/remove-remote-helpers-in-python | John Keeping | 2013-09-09 | 16 | -1815/+0 |
* | | Merge branch 'ss/doclinks' | Junio C Hamano | 2013-09-17 | 7 | -10/+10 |
|\ \ | |||||
| * | | Documentation: make AsciiDoc links always point to HTML filesss/doclinks | Sebastian Schuberth | 2013-09-06 | 7 | -10/+10 |
| |/ | |||||
* | | Merge branch 'rh/ishes-doc' | Junio C Hamano | 2013-09-17 | 30 | -83/+118 |
|\ \ | |||||
| * | | glossary: fix and clarify the definition of 'ref'rh/ishes-doc | Richard Hansen | 2013-09-04 | 1 | -4/+14 |
| * | | revisions.txt: fix and clarify <rev>^{<type>} | Richard Hansen | 2013-09-04 | 1 | -4/+8 |
| * | | glossary: more precise definition of tree-ish (a.k.a. treeish) | Richard Hansen | 2013-09-04 | 1 | -3/+12 |
| * | | use 'commit-ish' instead of 'committish' | Richard Hansen | 2013-09-04 | 23 | -63/+63 |
| * | | use 'tree-ish' instead of 'treeish' | Richard Hansen | 2013-09-04 | 6 | -8/+8 |
| * | | glossary: define commit-ish (a.k.a. committish) | Richard Hansen | 2013-09-04 | 1 | -0/+12 |
| * | | glossary: mention 'treeish' as an alternative to 'tree-ish' | Richard Hansen | 2013-09-04 | 1 | -1/+1 |
* | | | Merge branch 'dw/diff-no-index-doc' | Junio C Hamano | 2013-09-17 | 2 | -5/+22 |
|\ \ \ | |||||
| * | | | diff --no-index: describe in a separate paragraphdw/diff-no-index-doc | Junio C Hamano | 2013-08-28 | 1 | -5/+9 |
| * | | | diff --no-index: clarify operation when not inside a repository | Dale R. Worley | 2013-08-22 | 2 | -2/+15 |
* | | | | Merge branch 'ta/user-manual' | Junio C Hamano | 2013-09-17 | 1 | -79/+63 |
|\ \ \ \ | |||||
| * | | | | "git prune" is safeta/user-manual | Thomas Ackermann | 2013-08-27 | 1 | -9/+3 |
| * | | | | Remove irrelevant reference from "Tying it all together" | Thomas Ackermann | 2013-08-27 | 1 | -2/+1 |
| * | | | | Remove unnecessary historical note from "Object storage format" | Thomas Ackermann | 2013-08-27 | 1 | -2/+0 |
| * | | | | Improve section "Merging multiple trees" | Thomas Ackermann | 2013-08-27 | 1 | -14/+13 |
| * | | | | Improve section "Manipulating branches" | Thomas Ackermann | 2013-08-27 | 1 | -12/+8 |
| * | | | | Simplify "How to make a commit" | Thomas Ackermann | 2013-08-27 | 1 | -8/+2 |
| * | | | | Fix some typos and improve wording | Thomas Ackermann | 2013-08-27 | 1 | -10/+10 |
| * | | | | Use "git merge" instead of "git pull ." | Thomas Ackermann | 2013-08-27 | 1 | -4/+4 |
| * | | | | Use current output for "git repack" | Thomas Ackermann | 2013-08-27 | 1 | -9/+7 |
| * | | | | Use current "detached HEAD" message | Thomas Ackermann | 2013-08-27 | 1 | -6/+13 |
| * | | | | Call it "Git User Manual" and remove reference to very old Git version | Thomas Ackermann | 2013-08-27 | 1 | -3/+2 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'fc/trivial' | Junio C Hamano | 2013-09-17 | 4 | -16/+12 |
|\ \ \ \ | |||||
| * | | | | pull: use $curr_branch_short more | René Scharfe | 2013-09-08 | 1 | -3/+2 |
| * | | | | add: trivial style cleanup | Felipe Contreras | 2013-08-30 | 1 | -5/+5 |
| * | | | | reset: trivial style cleanup | Felipe Contreras | 2013-08-30 | 1 | -1/+1 |
| * | | | | branch: trivial style fix | Felipe Contreras | 2013-08-30 | 1 | -1/+1 |
| * | | | | reset: trivial refactoring | Felipe Contreras | 2013-08-30 | 1 | -6/+3 |
* | | | | | Merge branch 'fc/fast-export' | Junio C Hamano | 2013-09-17 | 1 | -40/+47 |
|\ \ \ \ \ | |||||
| * | | | | | fast-export: refactor get_tags_and_duplicates()fc/fast-export | Felipe Contreras | 2013-09-03 | 1 | -30/+38 |
| * | | | | | fast-export: make extra_refs global | Felipe Contreras | 2013-09-03 | 1 | -11/+10 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'ab/gitweb-author-initials' | Junio C Hamano | 2013-09-17 | 1 | -0/+1 |
|\ \ \ \ \ | |||||
| * | | | | | gitweb: Fix the author initials in blame for non-ASCII namesab/gitweb-author-initials | Ævar Arnfjörð Bjarmason | 2013-08-30 | 1 | -0/+1 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'jk/has-sha1-file-retry-packed' | Junio C Hamano | 2013-09-17 | 1 | -1/+4 |
|\ \ \ \ \ | |||||
| * | | | | | has_sha1_file: re-check pack directory before giving upjk/has-sha1-file-retry-packed | Jeff King | 2013-08-30 | 1 | -1/+4 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'jk/write-broken-index-with-nul-sha1' | Junio C Hamano | 2013-09-17 | 3 | -4/+63 |
|\ \ \ \ \ | |||||
| * | | | | | write_index: optionally allow broken null sha1sjk/write-broken-index-with-nul-sha1 | Jeff King | 2013-08-28 | 3 | -4/+63 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'jx/clean-interactive' | Junio C Hamano | 2013-09-17 | 1 | -2/+2 |
|\ \ \ \ \ | |||||
| * | | | | | documentation: clarify notes for clean.requireForce | Jiang Xin | 2013-08-28 | 1 | -2/+2 |
* | | | | | | Merge branch 'tb/precompose-autodetect-fix' | Junio C Hamano | 2013-09-17 | 4 | -7/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Set core.precomposeunicode to true on e.g. HFS+tb/precompose-autodetect-fix | Torsten Bögershausen | 2013-08-27 | 4 | -7/+4 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge branch 'kk/tests-with-no-perl' | Junio C Hamano | 2013-09-17 | 3 | -44/+67 |
|\ \ \ \ \ \ | |||||
| * | | | | | | reset test: modernize stylekk/tests-with-no-perl | Jonathan Nieder | 2013-08-24 | 1 | -7/+24 |
| * | | | | | | t/t7106-reset-unborn-branch.sh: Add PERL prerequisite | Kacper Kornet | 2013-08-24 | 1 | -1/+1 |
| * | | | | | | add -i test: use skip_all instead of repeated PERL prerequisite | Jonathan Nieder | 2013-08-24 | 1 | -35/+41 |