repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'jc/cherry-pick' (early part)
2008-03-11
Ju
n
io C Hamano
Merge b
r
anc
h
'jc/cherry-pick' (early
part)
commit
|
commitdiff
|
tree
2008-03-11
Ju
n
io C
H
am
a
no
M
erge bran
c
h '
m
aint'
commit
|
commitdiff
|
tree
2008-03-11
Junio C H
a
ma
n
o
Merge
b
ranch '
k
b/ma
i
nt-filt
e
r-branch-disappear'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2008-03-11
Junio C Hamano
Merge branc
h
'aw/m
a
i
n
t
-short
l
og
-
bla
n
k-lines' in
t
o m
a
int
commit
|
commitdiff
|
tree
2008-03-11
SZE
D
ER Gábor
u
p
date 'git rebase' doc
u
men
t
ation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-10
Junio C Hama
n
o
gi
t
-pull documentat
i
on: warn about the optio
n
o
r
der
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Jeff King
Add a te
s
t fo
r
read-tre
e
-u -
-
r
eset with a D/F conflict
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
J
unio C
H
amano
Merge branch 'ph/p
a
rseopt'
commit
|
commitdiff
|
tree
2008-03-09
Ju
n
io C Hamano
Merge br
a
nch 'dp/clean-fi
x
'
commit
|
commitdiff
|
tree
2008-03-09
Junio C H
a
mano
Merge bran
c
h '
m
l/submodule
-
add-existing'
commit
|
commitdiff
|
tree
2008-03-09
Junio C Ha
m
ano
M
erge branch 'mr/com
p
at-sn
p
rintf'
commit
|
commitdiff
|
tree
2008-03-09
Jun
i
o C
Hamano
M
e
r
ge branch 'sp/
f
etch-optim'
commit
|
commitdiff
|
tree
2008-03-09
Junio C Hamano
Me
r
g
e branch 'jc/describ
e
-a
l
ways'
commit
|
commitdiff
|
tree
2008-03-09
Junio C Hamano
Merge branch
'
jc/am'
commit
|
commitdiff
|
tree
2008-03-09
Junio
C Hamano
Merge b
r
anch
'
cr/reset-par
s
eopt'
commit
|
commitdiff
|
tree
2008-03-09
Junio C Hamano
Merge branch 'jn/gitwe
b
-pickaxe'
commit
|
commitdiff
|
tree
2008-03-09
Junio C Hamano
Me
r
ge bran
c
h 'kb/maint-filter-br
a
n
c
h
-
d
isappear'
commit
|
commitdiff
|
tree
2008-03-09
Junio C Hamano
Me
r
ge branch
'mai
n
t' to sync with
1
.
5
.
4
.
4
commit
|
commitdiff
|
tree
2008-03-09
J
u
n
io C H
a
ma
n
o
GIT 1
.
5
.
4
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
San
t
i Béj
a
r
ident
.
c: rew
o
rd error message when t
h
e user nam
e
cannot
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
John Goerzen
Fix
d
c
o
mmit
,
rebase wh
e
n rewriteRoot is
i
n use
commit
|
commitdiff
|
tree
2008-03-08
Junio C Hamano
fi
l
ter-branch: handle "d
i
sappe
a
r
i
n
g
tree" case
c
orre
c
t
ly
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-08
Cha
r
les Bailey
merge
-
tool
d
o
c
u
m
entation: de
s
cr
i
b
e
custom comma
n
d usage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-08
Char
l
es
Bail
e
y
git-mergetool
d
ocumen
t
aito
n
: s
h
ow toolnam
e
s in
typewriter
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-08
Adeodato Si
m
ó
R
e
ally make
t
he LF
a
ft
e
r
reset in fast-impor
t
op
t
ional
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-08
Junio
C
Hamano
M
e
rg
e
branch '
a
w/m
a
i
nt-shor
t
log-blank
-
lines'
commit
|
commitdiff
|
tree
2008-03-08
Junio C Hamano
Mer
g
e branch 'mh/
m
aint-http-proxy-fix'
i
n
to maint
commit
|
commitdiff
|
tree
2008-03-08
J
u
nio C
H
a
m
ano
Mer
g
e branch 'j
s
/maint-daemon' in
t
o
mai
n
t
commit
|
commitdiff
|
tree
2008-03-08
Junio C Hamano
M
e
r
ge
b
ranch 'js/maint-cvsexp
o
rt' into
m
ai
n
t
commit
|
commitdiff
|
tree
2008-03-08
Junio C Hamano
Merge bra
n
ch 'jc/maint-log-
m
e
r
g
e-left-right' into
maint
commit
|
commitdiff
|
tree
2008-03-08
Junio C Hamano
Merge branch 'ew/maint-svn-cert-fileprovider' into
.
.
.
commit
|
commitdiff
|
tree
2008-03-08
J
uni
o
C Hamano
Merge br
a
nch
'maint'
commit
|
commitdiff
|
tree
2008-03-08
Jun
i
o
C
Ham
a
no
send-email: -
-
n
o-s
i
gned-of
f
-cc sh
o
uld suppress 'so
b
' cc
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-08
J
un
i
o
C Hama
n
o
Mer
g
e
b
r
anch 'js/reflog-del
e
t
e'
commit
|
commitdiff
|
tree
2008-03-08
Junio C Hamano
Merge bran
c
h 'dc
/
f
ormat-pr
e
tt
y
'
commit
|
commitdiff
|
tree
2008-03-08
Junio C Ha
m
a
n
o
M
erge
b
ran
c
h
'
cb/mergetool
'
commit
|
commitdiff
|
tree
2008-03-08
Junio C Hama
n
o
git-clean: add te
s
ts
for relative path
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-08
D
mitr
y
Potapo
v
git
-
clean
:
c
o
rrect printing relat
i
ve path
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-08
Dmi
t
ry Pot
a
pov
Make pr
i
vate quote_pat
h
() in
w
t-status
.
c available
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-07
P
i
erre Habouzit
unquote_c_style: f
i
x of
f
-
by-o
n
e
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-07
J
unio C Hamano
t
est-li
b
: fix T
E
RM to du
m
b
f
o
r
test repeata
b
ility
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-07
Uwe
Kleine-K
ö
nig
config
.
tx
t
: refer to --u
p
load-p
a
ck an
d
--rec
e
ive-pack
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-07
J
unio C Hamano
Merge
b
ranch 'ar
/
sgid-bsd'
commit
|
commitdiff
|
tree
2008-03-07
Junio C Hama
n
o
Merge branch 'c
c
/
run-c
o
m
m
and'
commit
|
commitdiff
|
tree
2008-03-07
J
un
i
o C Hamano
Re
v
ert part
of
d089eba (setup:
s
a
nitize absolu
t
e
a
nd
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-07
Juni
o
C Hamano
Revert part of
1
a
bf095 (git-a
d
d: adjust
t
o
the get_pathspe
c
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-07
Junio C Ha
m
a
n
o
Revert pa
r
t
of 7
4
4d
a
cd (builtin-mv: minimum fix to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-07
Junio C
Hamano
get_pa
t
hspec(): die when an out-of-tree path is given
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-06
J
unio C Haman
o
M
e
rge
b
ranch 'maint' of git://
r
epo
.
or
.
cz/git-gui into
.
.
.
commit
|
commitdiff
|
tree
2008-03-05
Jak
u
b Nareb
s
ki
gitweb: Fix and simplify
p
ickaxe sear
c
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Ma
r
k Leved
a
hl
git-submod
u
le - Al
l
o
w ad
d
ing a submodu
l
e in
-
pl
a
ce
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Andy
W
hi
t
croft
s
hortlo
g
: take th
e
first populated line of the d
e
scri
p
t
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Micha
l
Rokos
Add compat/snprin
t
f
.
c for systems that
r
eturn bog
u
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Alex Riesen
Do not
u
se GUID on dir in
git init --shared
=
all on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Chr
i
stian Couder
run-co
m
mand: Redirect stderr to a pipe b
e
for
e
redirecting
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Carlo
s
R
i
ca
Make builtin-r
e
set
.
c use
p
ar
s
e_opt
i
on
s
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
SZEDER Gáb
o
r
ba
s
h
:
git-branc
h
-d
and
-
m lists only
l
ocal branc
h
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
SZ
E
DER Gábor
b
a
sh:
a
dd git-branch
options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
A
dd a ver
y
basic te
s
t script
for git
merg
e
tool
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Teach g
i
t
mergetool
to use custom commands defined
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
C
h
a
rles Bailey
Changed
a
n
internal variabl
e
o
f
mergetool to
suppor
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Charles B
a
i
ley
T
i
dy up git mergetool's backup fi
l
e
behaviour
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Denis C
h
eng
l
o
g/show/whatch
a
n
g
ed: introduce
form
a
t
.
pr
e
tty
confi
g
uration
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Denis
C
heng
specify
e
xplicit "--pretty=med
i
um" with `g
i
t lo
g
/
s
how
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Denis
Cheng
whatchanged documenta
t
io
n
: share descripti
o
n o
f
--pretty
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Junio C Hamano
am: --rebasing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
J
u
ni
o
C Ha
m
ano
a
m
: remove s
u
p
po
r
t f
o
r -
d
.
dotest
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Juni
o
C Ha
m
ano
am:
read from the right mailbox when s
t
a
rted from a
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Junio C Hamano
f
sck
.
c:
f
ix b
o
gus "
e
mpty
t
re
e
" che
c
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
S
h
awn O
.
Pearce
Teac
h
git-fetch to exploi
t
s
erver side a
u
tomatic tag
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Shawn O
.
Pearce
Teach
fetch-pac
k
/up
l
oad-p
a
ck about --include-tag
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Shawn O
.
Pearce
git-pack-objects
:
Automatically pack annota
t
ed t
a
gs
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-04
J
u
nio
C
Hamano
Revert "unpa
c
k-obje
c
ts: preve
n
t w
r
iting of incons
i
stent
.
.
.
commit
|
commitdiff
|
tree
2008-03-04
Jun
i
o C Ha
m
an
o
R
ever
t
"receive-pack: use
s
tri
c
t mode for
u
npa
c
ki
n
g
.
.
.
commit
|
commitdiff
|
tree
2008-03-04
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-03-04
Shawn O
.
Pearce
Fix 'git rem
o
te show' regressi
o
n on empty repository
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-04
Mik
e
Ho
m
m
e
y
t
3407
-
r
eb
a
se-abort
.
sh: Enhan
c
e e
x
i
s
t
ing t
e
sts, and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-04
Sim
o
n
H
au
s
mann
git-p
4
: F
i
x imp
o
rt of
c
hangesets with fil
e
deletions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-04
Ale
x
Riese
n
Fix
t
est for cle
a
nup failure i
n
t
7
3
00 on
Windows
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-04
Junio C Hamano
t6120
(describe): check --lo
n
g p
r
operly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-04
Shawn
O
.
P
earce
Add g
i
t-de
s
cr
i
be
test for "
v
eri
f
y anno
t
ated tag names
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-04
Shawn O
.
Pearce
Test
for
p
acked tags in git
-
describe output
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-04
Shawn O
.
Pearce
Do
n
't allo
w
git-des
c
ribe failures to go unnoticed in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Juni
o
C Hama
n
o
d
escribe: re-f
i
x display
_
n
ame()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Matthieu
Moy
Fix incorrect wording in git
-
me
r
ge
.
tx
t
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Gerrit Pape
git-mer
g
e
.
s
h: bette
r
ha
n
dli
n
g
of combined
-
-
squash
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Mike Hommey
Fix random
crashes in http_cleanup()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Junio C Haman
o
d
e
scri
b
e: fi
x
-
-
l
ong output
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Junio C Hamano
g
it-
d
escribe: use
tags f
o
und in packed-re
f
s correctly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
B
randon
Case
y
t3903-stash
.
sh: Ad
d
tests for new stash commands dr
o
p
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Brand
o
n Casey
git-reflog
.
txt:
D
ocumen
t
ne
w
co
m
man
d
s --update
r
ef and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
B
randon
Casey
t3903
-
s
ta
s
h
.
sh: Add missing '&&' to
body of testcase
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Junio
C
Ha
m
a
n
o
Merge
commit '
7
435
9
82
1
' into js/refl
o
g-delete
commit
|
commitdiff
|
tree
2008-03-03
Mart
i
n Koe
g
ler
f
etch
-
pa
c
k: check
pa
r
se_commit/
o
bject result
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
J
u
nio C Haman
o
describe -
-
always: f
a
ll bac
k
to showing a
n
abbreviated
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Shawn O
.
P
e
a
r
ce
T
ea
c
h git-fetch to
grab
a tag
at the same
t
i
me
a
s
a
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Shawn O
.
Pearce
M
a
k
e
g
it-fetch
follow
tags w
e
already
h
ave
ob
j
ects
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Sh
a
wn O
.
Pear
c
e
Teach up
l
oad-p
a
ck to log t
h
e re
c
eived need
lines to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Shawn
O
.
Pear
c
e
Free
the path_lists u
s
ed to fin
d
non-local t
a
g
s in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
S
h
a
w
n O
.
Pearce
Allow buil
t
i
n-fetch's
find_non_local
_
tags t
o
append
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next