summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | contrib/git-credential-gnome-keyring.c: strlen() returns size_t, not ssize_tBrandon Casey2013-10-161-1/+1
| * | | | | contrib/git-credential-gnome-keyring.c: exit non-zero when called incorrectlyBrandon Casey2013-10-161-1/+1
| * | | | | contrib/git-credential-gnome-keyring.c: add static where applicableBrandon Casey2013-10-161-9/+9
| * | | | | contrib/git-credential-gnome-keyring.c: *style* use "if ()" not "if()" etc.Brandon Casey2013-10-161-10/+10
| * | | | | contrib/git-credential-gnome-keyring.c: remove unused die() functionBrandon Casey2013-09-231-10/+0
| * | | | | contrib/git-credential-gnome-keyring.c: remove unnecessary pre-declarationsBrandon Casey2013-09-231-13/+0
* | | | | | Merge branch 'po/dot-url'Junio C Hamano2013-10-232-2/+8
|\ \ \ \ \ \
| * | | | | | doc/cli: make "dot repository" an independent bullet pointpo/dot-urlPhilip Oakley2013-10-151-4/+4
| * | | | | | config doc: update dot-repository notesPhilip Oakley2013-09-131-2/+4
| * | | | | | doc: command line interface (cli) dot-repository dwimmeryPhilip Oakley2013-09-131-0/+4
* | | | | | | Merge branch 'jc/prompt-upstream'Junio C Hamano2013-10-231-1/+6
|\ \ \ \ \ \ \
| * | | | | | | git-prompt.sh: optionally show upstream branch namejc/prompt-upstreamJulien Carsique2013-10-141-1/+6
* | | | | | | | Merge branch 'hu/cherry-pick-previous-branch'Junio C Hamano2013-10-232-2/+14
|\ \ \ \ \ \ \ \
| * | | | | | | | cherry-pick: handle "-" after parsing optionshu/cherry-pick-previous-branchJeff King2013-10-102-2/+14
* | | | | | | | | Merge branch 'mg/more-textconv'Junio C Hamano2013-10-2314-57/+237
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | grep: honor --textconv for the case rev:pathmg/more-textconvMichael J Gruber2013-05-104-16/+29
| * | | | | | | | | grep: allow to use textconv filtersJeff King2013-05-105-16/+102
| * | | | | | | | | t7008: demonstrate behavior of grep with textconvMichael J Gruber2013-05-101-0/+31
| * | | | | | | | | cat-file: do not die on --textconv without textconv filtersMichael J Gruber2013-05-102-25/+13
| * | | | | | | | | show: honor --textconv for blobsMichael J Gruber2013-05-102-6/+25
| * | | | | | | | | diff_opt: track whether flags have been set explicitlyJunio C Hamano2013-05-104-3/+19
| * | | | | | | | | t4030: demonstrate behavior of show with textconvMichael J Gruber2013-05-101-0/+24
* | | | | | | | | | Merge branch 'jc/pack-objects'Junio C Hamano2013-10-231-11/+12
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | pack-objects: shrink struct object_entryjc/pack-objectsJunio C Hamano2013-02-041-11/+12
* | | | | | | | | | | Update draft release notes to 1.8.5Junio C Hamano2013-10-181-0/+7
* | | | | | | | | | | Merge branch 'maint'Junio C Hamano2013-10-181-1/+5
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
| * | | | | | | | | | git-merge: document the -S optionNicolas Vigier2013-10-181-1/+5
* | | | | | | | | | | Merge branch 'jc/reflog-doc'Junio C Hamano2013-10-183-3/+49
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | setup_reflog_action: document the rules for using GIT_REFLOG_ACTIONjc/reflog-docJunio C Hamano2013-06-193-3/+49
* | | | | | | | | | | | Merge branch 'sb/repack-in-c'Junio C Hamano2013-10-185-1/+391
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | repack: improve warnings about failure of renaming and removing filesStefan Beller2013-09-171-2/+3
| * | | | | | | | | | | | repack: retain the return value of pack-objectsStefan Beller2013-09-171-2/+2
| * | | | | | | | | | | | repack: rewrite the shell script in CStefan Beller2013-09-175-1/+390
* | | | | | | | | | | | | Merge branch 'jk/clone-progress-to-stderr'Junio C Hamano2013-10-184-28/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | clone: always set transport optionsjk/clone-progress-to-stderrJeff King2013-09-182-16/+18
| * | | | | | | | | | | | | clone: treat "checking connectivity" like other progressJeff King2013-09-182-3/+4
| * | | | | | | | | | | | | clone: send diagnostic messages to stderrJeff King2013-09-183-10/+11
* | | | | | | | | | | | | | Merge git://github.com/git-l10n/git-poJunio C Hamano2013-10-181-2367/+3193
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | l10n: fr.po: 2135/2135 messages translatedJean-Noel Avila2013-10-181-2367/+3193
* | | | | | | | | | | | | | | Update draft release notes to 1.8.5Junio C Hamano2013-10-171-0/+4
* | | | | | | | | | | | | | | Merge branch 'jk/format-patch-from'Junio C Hamano2013-10-174-1/+49
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | format-patch: print in-body "From" only when neededjk/format-patch-fromJeff King2013-09-204-1/+49
* | | | | | | | | | | | | | | | Merge branch 'es/name-hash-no-trailing-slash-in-dirs'Junio C Hamano2013-10-175-51/+50
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | dir: revert work-around for retired dangerous behaviores/name-hash-no-trailing-slash-in-dirsEric Sunshine2013-09-171-15/+3
| * | | | | | | | | | | | | | | | name-hash: stop storing trailing '/' on paths in index_state.dir_hashEric Sunshine2013-09-173-7/+8
| * | | | | | | | | | | | | | | | employ new explicit "exists in index?" APIEric Sunshine2013-09-173-9/+9
| * | | | | | | | | | | | | | | | name-hash: refactor polymorphic index_name_exists()Eric Sunshine2013-09-172-24/+34
| | |_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'jk/trailing-slash-in-pathspec'Junio C Hamano2013-10-173-20/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | reset: handle submodule with trailing slashjk/trailing-slash-in-pathspecJohn Keeping2013-09-132-4/+10
| * | | | | | | | | | | | | | | | rm: re-use parse_pathspec's trailing-slash removalJohn Keeping2013-09-131-16/+4