repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
add test_cmp function for test scripts
2008-03-13
Jeff K
i
ng
add tes
t
_
c
mp function for
test scrip
t
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-13
Jeff Kin
g
rem
o
v
e use of "
t
ail -n 1" an
d
"tail -1"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-13
Jef
f
Ki
n
g
g
r
ep portabilit
y
fix: don'
t
use "-e" or "-q"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-13
J
e
f
f King
more t
r
porta
b
ility test script
f
ixes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-13
Jeff King
t0050: perl
p
or
t
ability
f
ix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-13
Jeff King
tr p
o
r
tability
f
i
x
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-12
Ju
n
io C Ham
a
n
o
Merge git://
r
e
p
o
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2008-03-12
Junio
C Haman
o
Merge branc
h
'js/remote'
commit
|
commitdiff
|
tree
2008-03-12
Junio C Hamano
M
e
rge bran
c
h
'
lt/unpack
-
trees'
commit
|
commitdiff
|
tree
2008-03-12
Sa
m
ue
l
T
a
rdieu
"remote updat
e
": print remote name b
e
i
n
g fetched
fro
m
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-12
Junio C Hamano
M
e
r
ge branch 'm
a
in
t
'
commit
|
commitdiff
|
tree
2008-03-12
Mar
c
-Andre Lureau
git-svn: fix find-rev error mess
a
g
e
whe
n
mis
s
ing arg
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-12
Jeff King
t00
2
1
:
t
r
portability fi
x
for
S
o
l
ar
i
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-12
Joha
n
nes Schindelin
launch_editor(): allow spaces in th
e
file
n
ame
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-12
Mike H
o
mmey
git rebase --abort:
a
lways resto
r
e the r
i
ght commit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-11
Junio C
H
amano
M
erge
b
ra
n
c
h 'jc
/
cherry-p
i
ck' (early
part)
commit
|
commitdiff
|
tree
2008-03-11
Junio C
Hamano
Mer
g
e branch
'maint'
commit
|
commitdiff
|
tree
2008-03-11
Junio C Ham
a
no
Merge branch 'kb/maint-
f
ilter-b
r
anch-disappear' into
.
.
.
commit
|
commitdiff
|
tree
2008-03-11
Junio C Ha
m
ano
Merge
branc
h
'aw/maint-shortl
o
g-blank-lines' into main
t
commit
|
commitdiff
|
tree
2008-03-11
Linus Torvalds
unpack_tree
s
(): fix
d
i
f
f-inde
x
regres
s
ion
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-11
SZEDE
R
Gábo
r
update '
g
it rebase
'
d
oc
u
mentation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-10
Junio C Haman
o
trave
r
se_trees_recursive(
)
:
propa
g
a
te merge errors up
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-10
J
u
nio C Hamano
git-p
u
ll
d
ocumenta
t
ion: warn about the
o
p
t
ion order
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Linus
T
orvalds
u
n
pac
k
_
trees(
)
: min
o
r memory
l
eak fix
i
n unuse
d
destination
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Linus Torvalds
Make
'unpack_t
r
ees()' have
a se
p
arate source and
d
estination
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Linus Torva
l
ds
Make 'unpa
c
k
_
trees()' ta
k
e the inde
x
t
o
work on as
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Linus
T
o
r
valds
Add
'
const'
w
here appropriat
e
to
i
ndex h
a
ndling functions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
L
i
nus Tor
v
a
l
ds
Fix tree-wal
k
ing compar
e
_entry() in th
e
presense o
f
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Linus Torval
d
s
Move
'un
p
a
ck_trees()' over
to 't
r
ave
r
se_trees()' interface
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Linus
Torvalds
M
ake 'traverse_tree
s
(
)'
traverse
conf
l
icti
n
g DF entries
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Linus Torvalds
A
d
d r
e
turn value to 't
r
aver
s
e_tre
e
()'
callbac
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
L
i
n
u
s
Torvald
s
Make '
t
raverse_tree
(
)' use linked st
r
uct
u
re rather
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Linus Torvalds
Add 'df_name_compare()' helper
f
u
n
ction
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Johan
n
es
Schindelin
buil
t
in
r
emote r
m
: remove
s
ymbolic refs, too
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Je
f
f King
Add
a test for read-tree
-
u
--r
e
set with a D/F conflict
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Junio C Hamano
Merge
b
ranc
h
'ph/parseopt'
commit
|
commitdiff
|
tree
2008-03-09
Junio
C Ham
a
no
Merge b
r
anch 'dp/c
l
e
an-fix
'
commit
|
commitdiff
|
tree
2008-03-09
Junio C
Hamano
M
erge branch 'ml/su
b
module-a
d
d
-e
x
is
t
i
n
g'
commit
|
commitdiff
|
tree
2008-03-09
Junio C Ham
a
no
Merge bra
n
ch 'mr/compat-s
n
p
ri
n
tf'
commit
|
commitdiff
|
tree
2008-03-09
Junio
C
Hamano
Merge br
a
nch
'
s
p/
f
etch-optim
'
commit
|
commitdiff
|
tree
2008-03-09
J
un
i
o C Hamano
Merg
e
br
a
nch 'jc/descr
i
be-always'
commit
|
commitdiff
|
tree
2008-03-09
Jun
i
o
C Haman
o
Merg
e
branch 'jc
/
am'
commit
|
commitdiff
|
tree
2008-03-09
Junio C Hamano
M
erge
b
ran
c
h 'cr
/
rese
t
-pa
r
seopt
'
commit
|
commitdiff
|
tree
2008-03-09
Junio C Hamano
Merge branc
h
'
j
n/gitweb-pick
a
xe
'
commit
|
commitdiff
|
tree
2008-03-09
Junio C Ham
a
no
M
e
rge branch 'kb/maint-filt
e
r-bra
n
ch-disappear
'
commit
|
commitdiff
|
tree
2008-03-09
Jun
i
o
C
Hamano
Merge bran
c
h 'ma
i
n
t' to sync
with 1
.
5
.
4
.
4
commit
|
commitdiff
|
tree
2008-03-09
Junio C Hamano
GIT
1
.
5
.
4
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Santi Bé
j
ar
ident
.
c
: reword error message when the user name cannot
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
John Goerzen
Fix dcomm
i
t, rebase when
rewrite
R
o
ot i
s
in use
commit
|
commitdiff
|
tree
2008-03-08
Junio
C
Hamano
filte
r
-branch: handle "disappearing tree"
case correc
t
l
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-08
Char
l
es Bailey
merge-tool documen
t
ation: describe custom
c
ommand usage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-08
Charles
B
ailey
git-mergetool documen
t
aiton: show toolname
s
in typewriter
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-08
A
d
eodato Simó
Really m
a
k
e
the LF
a
ft
e
r rese
t
in
f
ast-i
m
port optional
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-08
Junio
C
Hamano
M
e
r
ge branch
'
aw
/
mai
n
t-s
h
ortlog-blank-lines'
commit
|
commitdiff
|
tree
2008-03-08
Junio C Hamano
M
e
rg
e
branch '
m
h/maint-http-prox
y
-
f
ix'
i
n
to
m
aint
commit
|
commitdiff
|
tree
2008-03-08
Junio C Ha
m
a
n
o
Me
r
ge branc
h
'js
/
maint-dae
m
on' i
n
to maint
commit
|
commitdiff
|
tree
2008-03-08
J
unio C Hama
n
o
Merge bra
n
c
h 'js/main
t
-
c
vsexport' in
t
o maint
commit
|
commitdiff
|
tree
2008-03-08
Ju
n
i
o
C Hamano
M
e
r
ge branch 'jc
/
maint-l
o
g-merg
e
-le
f
t-right
'
into ma
i
n
t
commit
|
commitdiff
|
tree
2008-03-08
Junio C Ham
a
no
Merge br
a
nch 'ew/maint-svn-cert-fil
e
provid
e
r' into
.
.
.
commit
|
commitdiff
|
tree
2008-03-08
Junio C Hama
n
o
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2008-03-08
Junio C Ham
a
no
send-email:
-
-
no-signed-o
f
f
-c
c
s
hou
l
d su
p
press 's
o
b' cc
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-08
Junio C Hama
n
o
Merge bra
n
ch 'js/reflog-delete'
commit
|
commitdiff
|
tree
2008-03-08
Juni
o
C Hamano
Merg
e
b
r
anch 'dc
/
f
o
rmat-pre
t
ty'
commit
|
commitdiff
|
tree
2008-03-08
J
u
nio C Haman
o
Merge branch
'
cb/mergetool'
commit
|
commitdiff
|
tree
2008-03-08
Ju
n
io C Hamano
git-clean
:
add tests for
r
e
la
t
ive
p
ath
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-08
Dmi
t
r
y Potapov
git-c
l
ean
:
correct
p
rinting relative
p
ath
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-08
D
mitry Pota
p
ov
M
ake private quote_path
(
)
in wt-status
.
c avai
l
able
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-07
Pierre Habouzit
u
n
quote_c
_
style
:
fix off-by-one
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-07
Ju
n
io C
H
a
mano
test-lib:
fi
x
T
E
RM to du
m
b for test r
e
peat
a
bi
l
ity
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-07
U
we Kleine-Kö
n
i
g
c
o
nfi
g
.
txt: refer to -
-
upload-pack and
-
-receive-
p
ack
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-07
Junio C Hamano
Merge br
a
nch 'ar/sgid-bsd'
commit
|
commitdiff
|
tree
2008-03-07
J
unio
C
Hama
n
o
M
e
r
ge branch
'
c
c
/
r
un
-
c
omm
a
nd'
commit
|
commitdiff
|
tree
2008-03-07
J
unio C
H
amano
Revert part of d
0
89eba (setup: sanitize a
b
solute
a
n
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-07
Junio C Hamano
R
evert part of 1abf095 (git-add: adjust t
o
the g
e
t_p
a
t
hspec
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-07
Junio C Ham
a
no
R
e
vert part of 744
d
acd (builti
n
-
mv: min
i
mum fix to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-07
Junio
C
Hamano
ge
t
_pathspec
(
):
die w
h
e
n
a
n
out-of-t
r
ee path is given
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-06
Junio C Hamano
Merge branch
'
maint'
o
f git://repo
.
or
.
cz/
g
i
t
-g
u
i int
o
.
.
.
commit
|
commitdiff
|
tree
2008-03-05
Jaku
b
Narebski
gitweb: Fix and
simplify
p
ickaxe s
e
arch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
M
a
rk Leve
d
ahl
git-submodule - Allow adding
a
s
u
bmodule i
n
-place
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
A
ndy
Whitc
r
oft
shortlog: take
t
he first populated l
i
ne of the descriptio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Michal Rokos
Add compat
/
snprintf
.
c for
s
yst
e
m
s that return bogus
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Alex Ries
e
n
Do n
o
t use GUID on dir in g
i
t
init --sha
r
ed=a
l
l on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
C
hr
i
stian Couder
run-com
m
and: Red
i
rect stderr to a pi
p
e before redirecting
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Joh
a
nnes Schind
e
lin
remote: fix "update [group
.
.
.
]"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Carlos Rica
Mak
e
builtin-reset
.
c use parse_o
p
ti
o
ns
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
SZEDER
Gábor
bash: git-br
a
n
c
h
-
d and
-
m lists only
l
o
cal
b
ranches
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
SZEDER Gábor
bash: add gi
t
-branch optio
n
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Add a very basic test script for git mergetool
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Cha
r
les Bailey
Teach git mergetool to use
c
usto
m
commands defined
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Cha
r
les Bailey
Chan
g
ed an internal va
r
iabl
e
of mergetool to support
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Tidy up git
m
e
rge
t
ool's backup file behaviour
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Denis Cheng
l
o
g
/
show/whatchanged: introduce fo
r
mat
.
p
r
etty configura
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Denis Cheng
s
p
ecify ex
p
licit "--pretty=m
e
diu
m
" with
`git log/show
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Den
i
s C
h
e
n
g
whatch
a
nged d
o
cumentat
i
on
:
share
d
escr
i
pt
i
on o
f
--pretty
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Jun
i
o C Hamano
am: --rebasi
n
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Junio
C
Hamano
am: remove support for -d
.
dotest
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Jun
i
o C Hamano
am: read from the righ
t
m
a
i
l
box whe
n
started from
a
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Ju
n
io C Hamano
fsck
.
c: fix bo
g
u
s
"empty tree" check
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Sh
a
wn O
.
P
e
arce
Teach git-fetch to exploit server
s
ide a
u
to
m
atic tag
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Shawn
O
.
Pearce
Teac
h
f
etch-p
a
ck/upl
o
ad-pack
about --include-tag
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next