repo.or.cz
/
git
/
jnareb-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
gitweb: generate parent..current URLs
2008-09-06
Christi
a
n Co
u
der
b
isect: rem
o
ve "checkou
t
_done
"
v
a
ria
b
l
e used when checki
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-05
Heikki Orsila
d
iff --dirstat-b
y
-file: cou
n
t c
h
a
n
ge
d
f
iles, no
t
l
ines
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-05
M
i
klos Vajna
merge-r
e
c
ursive: get r
i
d of v
i
rtual_id
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-05
Ju
n
io
C Hamano
M
enti
o
n t
h
e
fac
t
that 'git anno
t
ate' is only for backwar
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-05
J
u
n
io C
H
aman
o
"blame -c" should b
e
c
o
mp
a
ti
b
l
e wit
h
"an
n
otate
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-05
Mikl
o
s Vaj
n
a
m
e
rge-recursive: move
c
urr
e
nt_{file,dir
e
ctory}_set
.
.
.
commit
|
commitdiff
|
tree
2008-09-05
M
iklos Vajn
a
merge-
r
e
c
ursive: mo
v
e
t
he global obuf to
struc
t
merge_o
p
tions
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajna
merge-r
e
cursiv
e
: get rid of the index_only global variable
commit
|
commitdiff
|
tree
2008-09-05
Junio C Hamano
Merge
b
ran
c
h 'jc/maint-lo
g
-grep'
commit
|
commitdiff
|
tree
2008-09-05
Juni
o
C Ha
m
ano
log --a
u
t
h
or/-
-
commi
t
ter: really
m
a
tch
o
n
l
y w
i
th
n
a
m
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-05
René Scharfe
add '%d' pretty fo
r
m
a
t speci
f
i
er to show
d
eco
r
a
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-05
René Scharfe
move l
o
ad_
r
ef_decorations() to log
-
t
ree
.
c and expor
t
i
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-05
René
S
charfe
l
og: add lo
a
d_ref
_
d
e
corations()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-04
Johan
Herland
Fix AsciiDoc errors i
n
merge document
a
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-04
Ju
n
io C
H
amano
diff --cumulative is
a
su
b
-opt
i
o
n
of --dirs
t
at
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-04
Junio C Hamano
safe_c
r
eate
_
lea
d
ing_directori
e
s():
make it about "lea
d
ing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-04
Petr Baudis
bash c
o
mpletion: Hid
e
more plumbing
comman
d
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-04
Miklos Vajna
merge-recursive: move call_depth t
o
s
t
ruct m
e
rg
e
_options
commit
|
commitdiff
|
tree
2008-09-03
Junio C Hamano
Update dr
a
ft release no
t
es for 1
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-03
Jun
i
o C Hamano
Mer
g
e bra
n
c
h
'maint'
commit
|
commitdiff
|
tree
2008-09-03
Junio C Hamano
Sta
r
t
1
.
6
.
0
.
2 m
a
intenan
c
e cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-03
J
unio
C
H
a
mano
Merge branch '
n
d
/
w
o
rktree
'
into maint
commit
|
commitdiff
|
tree
2008-09-03
Junio C Hamano
Merg
e
branch 'ho/da
s
hless' into
m
aint
commit
|
commitdiff
|
tree
2008-09-03
Nanako Shiraishi
te
s
ts: u
s
e "git xyzzy" form (t7200
- t9001)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-03
Nanako Shirais
h
i
tests: u
s
e "g
i
t
xyzz
y
"
f
orm (t700
0
- t7
1
99)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-03
Jonas
Fonseca
F
ix pass
w
d(5) ref and re
f
lec
t
that commit d
o
ens'
t
use
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-03
N
i
col
a
s Pitre
improve h
a
nd
l
ing of
sideb
a
n
d
message display
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-03
Nanak
o
Shir
a
ish
i
t
e
s
ts:
u
s
e "git xyzzy"
f
o
r
m
(t3600 - t6999)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-03
Nana
k
o Shiraishi
tes
t
s: use "git
x
yzzy
"
form (t0000
-
t35
9
9)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-03
Jeff King
chec
k
out: fix me
s
sa
g
e
when leaving detache
d
H
EAD
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-03
Clem
e
ns Bucha
c
her
clone:
fix
creat
i
on of exp
l
i
citl
y
named tar
g
et
dir
e
ctory
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-03
Ju
n
io C Ha
m
ano
Merge branch 'tr/filte
r
-
branc
h
'
commit
|
commitdiff
|
tree
2008-09-03
Junio C Hamano
Merge branch 'np/maint-safer-pack'
commit
|
commitdiff
|
tree
2008-09-03
J
unio C Hamano
Merge
b
r
anch 'rf
/
man-
e
n
v
'
commit
|
commitdiff
|
tree
2008-09-03
Junio C Ha
m
ano
Merg
e
branch 'j
c
/author-nickname'
commit
|
commitdiff
|
tree
2008-09-03
Junio C Hamano
Merge branch 'dp/pid
-
uintmax'
commit
|
commitdiff
|
tree
2008-09-03
Gius
e
ppe Bilo
t
t
a
gitweb: ref marke
r
s l
i
nk to named shortlogs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-03
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-09-03
Nicolas
P
i
tre
t5300: improve
S
HA1 collision
t
est
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-03
N
icola
s
Pitre
p
a
c
k
-obje
c
ts:
d
on't
includ
e
missing preferred
base
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-03
Nicolas
Pi
t
re
sha1write: don't copy
f
ull
s
ized b
u
ffers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-03
Ju
n
i
o C H
a
mano
Merge branch
'
np/maint-safer-pack'
in
t
o
np/pack
commit
|
commitdiff
|
tree
2008-09-03
Miklo
s
Vajna
Makef
i
l
e
: add merge_recursive
.
h to LIB_H
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-03
Miklos V
a
jna
cherry-pic
k
/revert: make d
i
rect int
e
rnal call
t
o me
r
g
e_tree()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-02
Heik
k
i Orsila
Improve docume
n
tation for --dir
s
tat dif
f
option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-02
Johan Herland
B
r
i
n
g
loca
l
clone's orig
i
n URL in line with
t
hat of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-02
SZEDER
G
ábo
r
D
ocumentation: mi
n
or clea
n
up in a u
s
e ca
s
e i
n
'git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-02
S
Z
E
DER Gábo
r
Documentation: fix disapp
e
ared
lines in 'g
i
t
stash
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-02
SZE
D
E
R
Gábor
Documentat
i
on
:
f
ix re
f
erence to a for-e
a
ch-re
f
option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-01
Jun
i
o C Hamano
git-merge d
o
c
um
e
n
t
ation:
d
e
scr
i
be how conf
l
ict i
s
present
e
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-01
Jun
i
o C
H
amano
chec
k
out --conflict=<s
t
yle>: recreate merge in a non
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-01
Junio C
Hamano
Mer
g
e branch 'tr/rev-list-docs' into tr/filt
e
r
-
branch
commit
|
commitdiff
|
tree
2008-08-31
David So
r
ia Parra
c
a
st
pid_t's to uintm
a
x_t to i
m
prove portability
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Junio C
H
a
mano
Mer
g
e branch '
m
aint'
commit
|
commitdiff
|
tree
2008-08-31
Thomas
R
a
st
t6013
:
repla
c
e u
s
e of '
t
a
c'
w
ith
e
quival
e
nt Perl
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Ask Bjørn Hansen
Do
c
umen
t
sendem
a
il
.
envelopesender conf
i
guration
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Gusta
f
Hendeby
Document clarifica
t
ion:
g
itmodules, gitattributes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Junio C
H
amano
g
i
t-
a
d
d
--inten
t
-to-add (-N)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Alex Riesen
A
dd
h
e
lp
.
a
utoco
r
rect to enable/disable
a
utocor
r
e
c
ting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Johannes Schindelin
g
it wrapper: DWIM mist
y
ped co
m
mands
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
J
u
nio C Hama
n
o
'git fo
o
' program identi
f
ies itself w
i
t
hou
t
dash
i
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
N
guyễn Thái Ngọc Du
y
setup_git_direc
t
ory(): fi
x
move
to workt
r
ee toplevel
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Ng
u
yễn Thá
i
N
gọc Duy
u
p
date-index: fix
w
orktree
setup
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Teemu Lik
o
ne
n
config
.
tx
t
: Add
missing colons
a
ft
e
r option name
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Junio C H
a
mano
git c
o
mmit
--a
u
thor
=
$name
:
look $name up in existing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Junio C Haman
o
diff: vary d
e
fau
l
t prefix
depending
o
n what
are compared
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Va
j
n
a
built
i
n-merge: avoi
d
run_command_v_opt() for recur
s
ive
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
m
e
rge-
r
ecursive: in
t
rod
u
ce me
r
ge_op
t
ion
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Steph
a
n Beyer
merge-recursive
.
c: Add more
generic
m
erge_recursive_generic
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Mikl
o
s
V
ajna
S
p
lit ou
t
merge_recurs
i
ve() to me
r
ge-recursiv
e
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
J
u
n
io C Hamano
diff
:
Hel
p
"
less" hide ^
M
from t
h
e output
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Junio C Hamano
Merge
b
ranch
'
maint'
commit
|
commitdiff
|
tree
2008-08-31
Junio C Hamano
git
a
ttributes: -crlf is not bin
a
ry
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Ju
n
io C Hama
n
o
c
h
e
c
kou
t
-
m
: recre
a
te merge
w
hen ch
e
ck
i
n
g
out of unmerged
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Junio C
H
am
a
no
M
e
rge b
r
anch 'jc/
m
aint-chec
k
out-fix' into 'jc/better
.
.
.
commit
|
commitdiff
|
tree
2008-08-31
J
unio C Ha
m
ano
git-merge-recursive: learn to honor merge
.
conflictstyle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Junio C Hamano
merge
.
conflictstyle: choose between "merge" and
"dif
f
3
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Junio C Ham
a
no
r
e
r
ere: unde
r
st
a
nd "diff3
-
m" style co
n
flicts with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Junio C H
a
mano
r
erere
.
c: use symbolic constants to keep tra
c
k of
p
arsing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Junio C Hamano
xm
e
rge
.
c
: "diff3
-m" style clips me
r
ge reductio
n
leve
l
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Junio C Haman
o
xmer
g
e
.
c:
minimum readabili
t
y fi
x
ups
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Juni
o
C Haman
o
x
diff-
m
erge: opt
i
onally sho
w
conflicts in "
d
iff3 -
m
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Junio
C Haman
o
xdl_
f
ill
_
merg
e
_buffer(): separ
a
te out a too deeply
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Juni
o
C H
a
ma
n
o
checkout --ours/--theirs
:
allow checking o
u
t one
s
ide
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Juni
o
C
H
amano
checkout -f: a
l
low ignoring unmer
g
ed p
a
ths
when check
i
ng
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Jun
i
o C Ha
m
ano
c
h
eckout
:
do not check out unmerged high
e
r s
t
ages r
a
ndomly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Jun
i
o C
Hamano
Merge bra
n
ch 'jc/post
-
simplif
y
' (early part)
i
nto tr
.
.
.
commit
|
commitdiff
|
tree
2008-08-30
Heikki Orsila
Start c
o
nforming
c
od
e
to "git s
u
b
cmd
"
style
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Junio C
H
a
mano
git-ap
p
ly: Loose
n
"
match
_
beginning" logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Junio C Haman
o
Fix
e
xample
i
n
git
-
name-rev
d
ocument
a
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Junio C Hamano
Merge b
r
an
c
h '
s
p/missing
-
t
h
in-base'
into mai
n
t
commit
|
commitdiff
|
tree
2008-08-30
Junio C Hamano
Merg
e
branch
'
s
b
/daemon'
commit
|
commitdiff
|
tree
2008-08-30
Junio C Hamano
Merge branc
h
'
af/maint-install-no-handlink'
i
nto mai
n
t
commit
|
commitdiff
|
tree
2008-08-30
J
u
n
io
C
Hamano
she
l
l: do not play d
u
plicated definition ga
m
es to
s
hrink
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Alex Ries
e
n
Fix use of hardlinks in "make inst
a
l
l
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Thomas
R
a
s
t
re
v
-list: fix
--reverse in
t
e
raction with --p
a
rents
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Nicolas P
i
tre
fixup_pack_header_fo
o
te
r
(): use nicely aligned buffer
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Nicol
a
s Pitr
e
i
ndex-pa
c
k: use fixup_pack
_
header_footer()'s validation
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Nicolas Pi
t
re
pack
-
obj
e
cts: use fi
x
up_pack_header_fo
o
ter()'
s
vali
d
atio
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
N
i
colas
Pitre
i
mp
r
o
ve relia
b
i
lity of f
i
xu
p
_pack_he
a
der
_
f
ooter
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next