summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* completion: improve untracked directory filtering for filename completionsg/complete-untracked-filterSZEDER Gábor2013-09-191-2/+2
* Update draft release notes to 1.8.5 for the first half of the fourth batchJunio C Hamano2013-09-171-0/+22
* Merge branch 'jk/remove-remote-helpers-in-python'Junio C Hamano2013-09-1716-1815/+0
|\
| * git_remote_helpers: remove little used Python libraryjk/remove-remote-helpers-in-pythonJohn Keeping2013-09-0916-1815/+0
* | Merge branch 'ss/doclinks'Junio C Hamano2013-09-177-10/+10
|\ \
| * | Documentation: make AsciiDoc links always point to HTML filesss/doclinksSebastian Schuberth2013-09-067-10/+10
| |/
* | Merge branch 'rh/ishes-doc'Junio C Hamano2013-09-1730-83/+118
|\ \
| * | glossary: fix and clarify the definition of 'ref'rh/ishes-docRichard Hansen2013-09-041-4/+14
| * | revisions.txt: fix and clarify <rev>^{<type>}Richard Hansen2013-09-041-4/+8
| * | glossary: more precise definition of tree-ish (a.k.a. treeish)Richard Hansen2013-09-041-3/+12
| * | use 'commit-ish' instead of 'committish'Richard Hansen2013-09-0423-63/+63
| * | use 'tree-ish' instead of 'treeish'Richard Hansen2013-09-046-8/+8
| * | glossary: define commit-ish (a.k.a. committish)Richard Hansen2013-09-041-0/+12
| * | glossary: mention 'treeish' as an alternative to 'tree-ish'Richard Hansen2013-09-041-1/+1
* | | Merge branch 'dw/diff-no-index-doc'Junio C Hamano2013-09-172-5/+22
|\ \ \
| * | | diff --no-index: describe in a separate paragraphdw/diff-no-index-docJunio C Hamano2013-08-281-5/+9
| * | | diff --no-index: clarify operation when not inside a repositoryDale R. Worley2013-08-222-2/+15
* | | | Merge branch 'ta/user-manual'Junio C Hamano2013-09-171-79/+63
|\ \ \ \
| * | | | "git prune" is safeta/user-manualThomas Ackermann2013-08-271-9/+3
| * | | | Remove irrelevant reference from "Tying it all together"Thomas Ackermann2013-08-271-2/+1
| * | | | Remove unnecessary historical note from "Object storage format"Thomas Ackermann2013-08-271-2/+0
| * | | | Improve section "Merging multiple trees"Thomas Ackermann2013-08-271-14/+13
| * | | | Improve section "Manipulating branches"Thomas Ackermann2013-08-271-12/+8
| * | | | Simplify "How to make a commit"Thomas Ackermann2013-08-271-8/+2
| * | | | Fix some typos and improve wordingThomas Ackermann2013-08-271-10/+10
| * | | | Use "git merge" instead of "git pull ."Thomas Ackermann2013-08-271-4/+4
| * | | | Use current output for "git repack"Thomas Ackermann2013-08-271-9/+7
| * | | | Use current "detached HEAD" messageThomas Ackermann2013-08-271-6/+13
| * | | | Call it "Git User Manual" and remove reference to very old Git versionThomas Ackermann2013-08-271-3/+2
| | |/ / | |/| |
* | | | Merge branch 'fc/trivial'Junio C Hamano2013-09-174-16/+12
|\ \ \ \
| * | | | pull: use $curr_branch_short moreRené Scharfe2013-09-081-3/+2
| * | | | add: trivial style cleanupFelipe Contreras2013-08-301-5/+5
| * | | | reset: trivial style cleanupFelipe Contreras2013-08-301-1/+1
| * | | | branch: trivial style fixFelipe Contreras2013-08-301-1/+1
| * | | | reset: trivial refactoringFelipe Contreras2013-08-301-6/+3
* | | | | Merge branch 'fc/fast-export'Junio C Hamano2013-09-171-40/+47
|\ \ \ \ \
| * | | | | fast-export: refactor get_tags_and_duplicates()fc/fast-exportFelipe Contreras2013-09-031-30/+38
| * | | | | fast-export: make extra_refs globalFelipe Contreras2013-09-031-11/+10
| | |/ / / | |/| | |
* | | | | Merge branch 'ab/gitweb-author-initials'Junio C Hamano2013-09-171-0/+1
|\ \ \ \ \
| * | | | | gitweb: Fix the author initials in blame for non-ASCII namesab/gitweb-author-initialsÆvar Arnfjörð Bjarmason2013-08-301-0/+1
| | |_|/ / | |/| | |
* | | | | Merge branch 'jk/has-sha1-file-retry-packed'Junio C Hamano2013-09-171-1/+4
|\ \ \ \ \
| * | | | | has_sha1_file: re-check pack directory before giving upjk/has-sha1-file-retry-packedJeff King2013-08-301-1/+4
| | |/ / / | |/| | |
* | | | | Merge branch 'jk/write-broken-index-with-nul-sha1'Junio C Hamano2013-09-173-4/+63
|\ \ \ \ \
| * | | | | write_index: optionally allow broken null sha1sjk/write-broken-index-with-nul-sha1Jeff King2013-08-283-4/+63
| | |/ / / | |/| | |
* | | | | Merge branch 'jx/clean-interactive'Junio C Hamano2013-09-171-2/+2
|\ \ \ \ \
| * | | | | documentation: clarify notes for clean.requireForceJiang Xin2013-08-281-2/+2
* | | | | | Merge branch 'tb/precompose-autodetect-fix'Junio C Hamano2013-09-174-7/+4
|\ \ \ \ \ \
| * | | | | | Set core.precomposeunicode to true on e.g. HFS+tb/precompose-autodetect-fixTorsten Bögershausen2013-08-274-7/+4
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'kk/tests-with-no-perl'Junio C Hamano2013-09-173-44/+67
|\ \ \ \ \ \
| * | | | | | reset test: modernize stylekk/tests-with-no-perlJonathan Nieder2013-08-241-7/+24