summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* remote-bzr: support the new 'force' optionfc/transport-helper-fixesRichard Hansen2014-02-242-2/+51
* test-hg.sh: tests are now expected to passRichard Hansen2014-02-241-2/+2
* transport-helper.c: do not overwrite forced bitMax Horn2014-02-241-1/+1
* transport-helper: check for 'forced update' messageFelipe Contreras2013-11-121-1/+7
* transport-helper: add 'force' to 'export' helpersFelipe Contreras2013-11-124-0/+40
* transport-helper: don't update refs in dry-runFelipe Contreras2013-10-311-4/+5
* transport-helper: mismerge fixFelipe Contreras2013-10-311-3/+0
* Update draft release notes to 1.8.5Junio C Hamano2013-10-231-0/+4
* Sync with 'maint'Junio C Hamano2013-10-231-0/+13
|\
| * Almost 1.8.4.2 ;-)Junio C Hamano2013-10-231-0/+13
| * Merge branch 'jc/ls-files-killed-optim' into maintJunio C Hamano2013-10-234-17/+67
| |\
| * \ Merge branch 'jh/checkout-auto-tracking' into maintJunio C Hamano2013-10-234-8/+45
| |\ \
| * \ \ Merge branch 'nd/fetch-into-shallow' into maintJunio C Hamano2013-10-2312-160/+152
| |\ \ \
* | \ \ \ Merge branch 'bc/gnome-keyring'Junio C Hamano2013-10-232-134/+167
|\ \ \ \ \
| * | | | | contrib/git-credential-gnome-keyring.c: support really ancient gnome-keyringbc/gnome-keyringBrandon Casey2013-10-161-0/+39
| * | | | | contrib/git-credential-gnome-keyring.c: support ancient gnome-keyringBrandon Casey2013-10-161-0/+58
| * | | | | contrib/git-credential-gnome-keyring.c: report failure to store passwordBrandon Casey2013-10-161-1/+9
| * | | | | contrib/git-credential-gnome-keyring.c: use glib messaging functionsBrandon Casey2013-10-161-29/+4
| * | | | | contrib/git-credential-gnome-keyring.c: use glib memory allocation functionsBrandon Casey2013-10-161-32/+16
| * | | | | contrib/git-credential-gnome-keyring.c: use secure memory for reading passwordsBrandon Casey2013-10-161-3/+9
| * | | | | contrib/git-credential-gnome-keyring.c: use secure memory functions for passwdsBrandon Casey2013-10-161-15/+6
| * | | | | contrib/git-credential-gnome-keyring.c: use gnome helpers in keyring_object()Brandon Casey2013-10-161-11/+3
| * | | | | contrib/git-credential-gnome-keyring.c: set Gnome application nameBrandon Casey2013-10-162-2/+5
| * | | | | contrib/git-credential-gnome-keyring.c: ensure buffer is non-empty before acc...Brandon Casey2013-10-161-1/+1
| * | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | |