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 git://repo.or.cz/git-gui
2008-03-12
Junio C Hamano
Merge git://repo
.
o
r
.
c
z/git-gui
commit
|
commitdiff
|
tree
2008-03-12
Junio C Hamano
Me
r
g
e
bra
n
c
h
'js/remot
e
'
commit
|
commitdiff
|
tree
2008-03-12
Junio C H
a
mano
Merge branch 'lt/unpack
-
t
rees'
commit
|
commitdiff
|
tree
2008-03-12
Samuel
Ta
r
dieu
"r
e
mot
e
upda
t
e": print remote name being fetched from
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-12
Junio C
Ham
a
no
M
erge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2008-03-12
Marc-A
n
dre Lur
e
au
git-svn: fix
find
-
re
v
error message when missing arg
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-12
Jeff King
t0021: tr po
r
t
a
bility f
i
x for Solaris
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-12
Johannes Schindel
i
n
la
u
nch_editor():
a
llow
s
p
ac
e
s
in the filename
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-12
Mike Homme
y
g
i
t
r
ebase --abort: alwa
y
s
restore the ri
g
ht comm
i
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-11
Ju
n
io
C Hamano
Merg
e
b
ranch 'j
c
/cherry-pick'
(
e
a
rl
y
part)
commit
|
commitdiff
|
tree
2008-03-11
Junio C Hamano
Merge
b
ra
n
c
h
'ma
i
nt
'
commit
|
commitdiff
|
tree
2008-03-11
J
u
nio C Hamano
Merge branch 'kb/maint-filter
-
branch-disappe
a
r' into
.
.
.
commit
|
commitdiff
|
tree
2008-03-11
Jun
i
o C Hamano
Merge b
r
a
n
ch 'aw
/
maint-short
l
og-b
l
an
k
-lines' into maint
commit
|
commitdiff
|
tree
2008-03-11
Linus
T
o
r
v
alds
unpack_tr
e
es(): fix diff-index regress
i
on
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-11
SZEDER Gábor
up
d
at
e
'gi
t
rebase' documenta
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-10
Junio C Hamano
t
rav
e
rse_tree
s
_recursive(): propagate
merge errors up
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-10
Junio
C Hamano
git-pull docum
e
n
tation: warn about
the opt
i
on
orde
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
L
inus Torvalds
unpa
c
k
_trees(): minor mem
o
ry leak
fix in unu
s
ed des
t
in
a
tion
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Lin
u
s Torvalds
Mak
e
'unpack_tree
s
()' h
a
ve a sepa
r
ate source and destination
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Lin
u
s
Torvalds
Make 'unpack_trees()' t
a
ke the index to work on as
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Linu
s
Torvalds
A
d
d
'const
'
w
h
e
re appropriate
t
o index handling function
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Linus Torva
l
d
s
Fix
t
r
e
e-w
a
lking compa
r
e
_
e
ntry() in the p
r
es
e
n
s
e of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Linus Torvalds
Move 'unpack_tr
e
es
(
)' o
v
e
r
to 'traverse_trees()' interface
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Lin
u
s Torv
a
lds
Make '
t
raverse_trees()' tra
v
erse c
o
nflicting
DF e
n
tries
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Lin
u
s T
o
rvald
s
Add return value
t
o 't
r
averse_tree()' callback
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
L
inus Torvald
s
M
ak
e
'trav
e
rse_tre
e
()'
use linked structure rather
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Linus
T
or
v
ald
s
Add 'df_na
m
e
_co
m
p
a
r
e
()' helpe
r
func
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
J
o
h
annes
S
chindelin
buil
t
in re
m
ot
e
r
m
: remove
symboli
c
refs, too
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Jeff King
Add
a
test for read
-
tree
-
u -
-
reset wit
h
a D/F conflict
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Jun
i
o
C Ham
a
no
Merge branch '
p
h/pars
e
opt
'
commit
|
commitdiff
|
tree
2008-03-09
J
unio C Ha
m
a
no
Merge branc
h
'
dp/clean-fix'
commit
|
commitdiff
|
tree
2008-03-09
Jun
i
o C Hamano
M
e
rge branch '
m
l/submod
u
le-add-existi
n
g'
commit
|
commitdiff
|
tree
2008-03-09
Ju
n
io C Hamano
Merge b
r
a
n
ch 'mr/compat
-
snprintf
'
commit
|
commitdiff
|
tree
2008-03-09
Junio C Hamano
Merge branc
h
'sp/fetch-opt
i
m
'
commit
|
commitdiff
|
tree
2008-03-09
J
u
nio
C Ham
a
n
o
M
e
rge branch 'j
c
/des
c
r
i
b
e-always'
commit
|
commitdiff
|
tree
2008-03-09
Jun
i
o
C
Hamano
Merge branch
'jc/am'
commit
|
commitdiff
|
tree
2008-03-09
Junio C
Hamano
Merge
b
ra
n
c
h 'c
r
/reset-par
s
eopt'
commit
|
commitdiff
|
tree
2008-03-09
Juni
o
C Ha
m
ano
Merge
branch 'jn/gitweb-pi
c
kaxe'
commit
|
commitdiff
|
tree
2008-03-09
Junio C Hamano
Merge branch
'kb/m
a
int
-
filter-branch-disappear'
commit
|
commitdiff
|
tree
2008-03-09
Jun
i
o C Hamano
Mer
g
e branch 'maint' to
sy
n
c with 1
.
5
.
4
.
4
commit
|
commitdiff
|
tree
2008-03-09
Junio C Hamano
G
I
T 1
.
5
.
4
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Santi Béjar
iden
t
.
c: reword error m
e
ssa
g
e when
t
he user name cannot
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Jo
h
n Goerzen
Fix dcommit, rebase when rewriteRo
o
t is in u
s
e
commit
|
commitdiff
|
tree
2008-03-08
J
unio C Hamano
fi
l
t
er-br
a
nch: handl
e
"disappearing tree" case
c
orrectly
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-08
Ch
a
rles B
a
ile
y
merge-tool documentat
i
on: describe
c
u
stom com
m
and usa
g
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-08
C
harles B
a
il
e
y
gi
t
-
m
e
r
getool d
o
cumentait
o
n:
sh
o
w to
o
lnames in typewriter
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-08
Adeodat
o
Simó
R
e
ally
m
a
ke the
L
F
after reset in
f
ast-import o
p
tional
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-08
Junio C Hamano
M
e
rge bran
c
h 'aw/maint
-
shortlog
-
b
l
ank-lines'
commit
|
commitdiff
|
tree
2008-03-08
Junio C Hamano
M
erg
e
branch 'mh/maint-http-proxy-fix
'
i
nto ma
i
n
t
commit
|
commitdiff
|
tree
2008-03-08
Junio C
H
aman
o
Merge branch 'j
s
/maint-daemon' i
n
to ma
i
nt
commit
|
commitdiff
|
tree
2008-03-08
Ju
n
io C Hamano
Merge
b
ranch '
j
s/mai
n
t-cvsexpor
t
' int
o
maint
commit
|
commitdiff
|
tree
2008-03-08
Junio C Hamano
Merge bran
c
h '
j
c/mai
n
t-
l
og-merge-left
-
right' i
n
to maint
commit
|
commitdiff
|
tree
2008-03-08
Junio
C H
a
mano
Merge branch 'e
w
/maint-svn-cert-filepro
v
ider' into
.
.
.
commit
|
commitdiff
|
tree
2008-03-08
Junio C Hama
n
o
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2008-03-08
Junio
C Ha
m
ano
send
-
e
mail:
-
-no-signed-off-cc
s
ho
u
ld suppre
s
s 'so
b
'
cc
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-08
Junio C Haman
o
Merge branch 'js/reflog-de
l
ete'
commit
|
commitdiff
|
tree
2008-03-08
Junio C
H
a
m
ano
Merg
e
branch 'dc/
f
ormat
-
pretty'
commit
|
commitdiff
|
tree
2008-03-08
Junio C Haman
o
Merge br
a
nch 'cb/m
e
rgeto
o
l'
commit
|
commitdiff
|
tree
2008-03-08
Junio
C H
a
mano
git-clean:
add t
e
st
s
fo
r
relati
v
e
path
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-08
Dmitry
Potapov
g
i
t-clean: correct pri
n
tin
g
relative
p
ath
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-08
Dmitry Po
t
apov
Ma
k
e privat
e
quote_pat
h
() in
wt-s
t
atus
.
c a
v
a
i
l
able
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-07
Pie
r
re
H
abouzit
unquote_
c
_style: fix of
f
-by-one
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-07
Junio C Hamano
t
est-lib: fix TERM
to dumb for test repeat
a
bili
t
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-07
U
w
e Kleine
-
K
ö
n
ig
c
onfig
.
txt: ref
e
r to -
-
upload-pack and
-
-receive-pack
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-07
Juni
o
C Hamano
Merge branc
h
'ar
/
sgid-bsd'
commit
|
commitdiff
|
tree
2008-03-07
Junio C Hamano
Merge bran
c
h 'cc/ru
n
-comm
a
n
d'
commit
|
commitdiff
|
tree
2008-03-07
Junio C
H
am
a
no
R
evert part of d
0
89eba (setup: s
a
nitize absolute an
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-07
Junio C Hamano
Re
v
ert part
o
f 1abf095 (git
-
add: a
d
just to
t
he get_
p
aths
p
ec
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-07
Junio C Hamano
Revert p
a
rt of 744dacd (
b
u
iltin-mv: m
i
ni
m
um fix to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-07
Junio C Hamano
get_pathspec():
die w
h
en an out-o
f
-tre
e
path is giv
e
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-06
Junio C H
a
mano
Merge
branch 'maint' of git://repo
.
or
.
cz/git-g
u
i i
n
to
.
.
.
commit
|
commitdiff
|
tree
2008-03-05
Jakub Nar
e
b
s
k
i
gi
t
web: Fix an
d
simplify pickaxe search
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Mark Leveda
h
l
g
it-submodule -
Allo
w
addi
n
g
a
s
ubmodule in-place
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Andy Whitcroft
shortlog: take the first popu
l
ated
line of the d
e
scription
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Michal Rokos
Ad
d
com
p
at/snprint
f
.
c for sy
s
tem
s
t
h
a
t retur
n
b
o
gus
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Al
e
x
Riesen
Do n
o
t use GUID on
d
ir in git init
-
-shared=all
on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
C
hr
i
st
i
an Couder
ru
n
-command: Redirect
stderr to a
p
ipe
before redir
e
c
ting
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Johann
e
s
Schindelin
remote: fi
x
"update [group
.
.
.
]"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Carlos
R
ica
Make builtin
-
rese
t
.
c us
e
parse_op
t
ions
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
SZEDER Gábor
ba
s
h:
g
it-b
r
a
n
ch -d and -m l
i
sts only local branches
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
SZEDER Gábor
bash: add g
i
t-branch options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
C
h
a
r
les Bailey
Add a
v
ery bas
i
c test script for git mergetool
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Charle
s
Bailey
T
each git mergetool to use custom commands de
f
ined
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Cha
r
les
B
a
i
ley
Changed
a
n in
t
ernal variable o
f
mer
g
eto
o
l
t
o supp
o
rt
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Tidy up gi
t
mergetool's backup file behaviour
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Denis Cheng
log/show/whatc
h
anged: intro
d
uce f
o
rmat
.
pretty conf
i
gur
a
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
De
n
is Chen
g
s
p
ecify
explicit "--p
r
etty=med
i
um" with `git lo
g
/show
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
De
n
is C
h
en
g
whatchanged
d
o
cumentation: share description of
--pretty
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Junio C Hamano
am
:
--
r
e
b
asing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Junio C
H
ama
n
o
am: rem
o
ve support for
-d
.
dote
s
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
J
u
nio C Ha
m
ano
a
m
: read from the right ma
i
lbox when s
t
a
r
ted from a
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Juni
o
C Hamano
f
s
ck
.
c: f
i
x
b
ogus
"empty tree" check
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Shawn O
.
Pearce
Teach git-fetch t
o
exploit server 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-p
a
ck/u
p
load-p
a
ck a
b
out --include-tag
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Sha
w
n
O
.
Pearce
g
i
t
-pack
-
objects: Automaticall
y
pack annotated ta
g
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-04
Junio C Hamano
Revert "unpac
k
-objects: prevent wr
i
ting
of inconsisten
t
.
.
.
commit
|
commitdiff
|
tree
2008-03-04
Ju
n
io C Hamano
Revert "receive-pack: u
s
e strict mode for unpacki
n
g
.
.
.
commit
|
commitdiff
|
tree
2008-03-04
Junio
C H
a
mano
M
erge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2008-03-04
Shawn O
.
Pearce
F
ix 'gi
t
remote show' regression on empt
y
repository
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-04
Mike
H
ommey
t3407
-
rebase
-
a
b
ort
.
sh
:
Enhance exis
t
ing
t
ests, a
n
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next