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
Fix merge name generation in "merge in C"
2008-07-23
M
iklos
V
ajna
t7601: exten
d
t
he 'm
e
rge picks u
p
the bes
t
result'
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-23
Dani
e
l Bar
k
alow
In perforce, RCS key
w
ord
s
a
r
e case
-
sensitive
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-23
Ale
x
Riesen
Allow pager of diff com
m
and b
e
ena
b
led/
d
isabled
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-22
Johann
e
s Sc
h
in
d
elin
Fix two left
o
vers from p
a
th_list->
s
t
ring
_
l
ist
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-22
Olivier Marin
git am --skip: clea
n
the
index while pre
s
erving local
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-22
Pier
r
e
Hab
o
u
z
i
t
git-submodule: move ill
p
l
aced shift
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-22
Pierre H
a
b
ouzit
built
i
n-mer
g
e: add
m
i
ssin
g
structure
i
n
itialization
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-22
Miklos Vajna
builtin-merge: give a
p
rop
e
r error
mes
s
a
ge fo
r
invalid
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-22
Junio C Haman
o
tests: do not
r
ely on external "patch"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-22
N
i
kolaj Schumacher
Don't cut off last
c
haracter
o
f commi
t
descripti
o
ns
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-22
Olivier Marin
parse-options: fix segmentation
f
ault when a
r
equired
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-22
Philippe Bruh
a
t
.
.
.
m
ailinfo
:
better parse email adresses containg parentheses
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-22
Olivier Marin
git
-
am: remove dash from he
l
p m
e
ssage
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-22
Ju
n
io C Haman
o
Re
v
ert "make git-status use a pager"
commit
|
commitdiff
|
tree
2008-07-22
J
on
a
than Nieder
git-diff(1): "--c
"
-> "--cc"
typo fix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-22
Joh
a
n
n
es Schindel
i
n
Rename
p
ath_list to string_list
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-22
Jo
h
a
nn
e
s Schi
n
delin
Rename
.
git/rebase
t
o
.
git/rebase
-
appl
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-21
Jun
i
o C Hamano
Update my e
-
ma
i
l add
r
ess
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-21
Junio C
H
amano
Merge branch
'ap
/
trackinfo'
commit
|
commitdiff
|
tree
2008-07-21
Junio C Ham
a
no
Merge branch '
j
c
/rerere-auto-more'
commit
|
commitdiff
|
tree
2008-07-21
Juni
o
C Hamano
Me
r
ge branch 'ns/am-abort
'
commit
|
commitdiff
|
tree
2008-07-21
Junio C
H
a
mano
M
e
rge branch 'jc/a
d
d-addremov
e
'
commit
|
commitdiff
|
tree
2008-07-21
Junio C Hamano
"
needs update" considere
d
harmful
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-21
Juni
o
C
Hamano
Move read
_
in_full
(
)
and w
r
i
te_in_full() to wrappe
r
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-21
Ju
n
io C Ham
a
no
Link s
h
ell with compat layer functi
o
ns
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-21
Junio C Hama
n
o
Me
r
ge b
r
anch
'ma
i
nt'
commit
|
commitdiff
|
tree
2008-07-20
Dmitry Potap
o
v
g
i
t-
s
vn: fix git
s
vn
i
nfo to work
without a
r
g
u
ments
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-20
M
i
che
l
e Bal
l
abi
o
builti
n
-push
.
c
:
Cleanup - use OPT
_
BIT(
)
and remove
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-20
M
i
che
l
e Ballabio
b
u
iltin-me
r
ge
.
c
:
Fix op
t
ion
p
arsi
n
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-20
Jon
a
than Nie
d
er
fix
usage string for git grep
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-20
Miklos Vajn
a
Teach
'g
i
t merge' that some merge str
a
tegies no longer
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-20
Lars Nosch
i
n
ski
c
vss
e
rver: Add test
s
uite for pack
e
d ref
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-20
Jun
i
o C Haman
o
refres
h
-index: fix bi
t
mask assign
m
ent
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-20
Jun
i
o
C
H
amano
git-add --a
l
l: documentation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-20
Ju
n
io C Hamano
gi
t
-
a
dd -
-
a
ll: tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-20
Junio C Hamano
git-add --all:
a
dd all files
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-20
Ju
n
io C Ha
m
ano
builtin-add
.
c
:
r
e
structure the code for maintainability
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
J
unio C Hamano
G
e
t
t
ing closer
to 1
.
6
.
0-r
c
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
Nanako Shiraishi
g
it a
m
--a
b
ort
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
Jun
i
o
C
Hamano
Merge bran
c
h
'
maint'
commit
|
commitdiff
|
tree
2008-07-19
Alexander Gav
r
ilov
Support
g
itlin
k
s in f
a
st
-
import
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
Junio C Hamano
.
mailmap
upda
t
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
Petr Baudis
D
ocumentation/git-merge
.
txt: Pa
r
tia
l
rewrite of How
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
René Scharfe
archiv
e
: remove u
n
u
sed header
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
R
e
né Scharfe
archiv
e
: make
zi
p
compression le
v
el
i
ndependent f
r
o
m
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
Petr Baudis
Docum
e
nta
t
i
o
n: How to ignore lo
c
al change
s
in
t
racked
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
Petr Baudis
Do
c
ume
n
ta
t
ion/gi
t
-sub
m
odu
l
e
.
tx
t
:
Furt
h
er c
l
ar
i
f
y
the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
Pe
t
er Harris
Add ANSI co
n
tro
l
code emulation
for the Wind
o
ws console
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
Johannes
Sixt
builtin-clone: rewrite guess_dir_name
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
Er
i
c Raib
l
e
Teac
h
lo
o
kup_prog
n
ot to select dire
c
tories
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
Fabia
n
E
mmes
testsuite for
c
vs co -c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
Lars Noschi
n
s
ki
cvsserve
r
: Ad
d
cvs co -c
s
u
p
port
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
Lar
s
Noschinsk
i
cvsse
r
ver:
A
dd s
u
p
p
ort fo
r
packed refs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
Fab
i
an E
m
mes
Te
s
tsuite: Unset
C
VS_SERVER
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
Stephan Beyer
Link
g
it
-
shell only
t
o a subset
o
f
libgit
.
a
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
Juni
o
C Hamano
t900
1
(send-email): Do no
t
use
h
ardcoded /bin/sh i
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
Junio C Hamano
GI
T
1
.
5
.
6
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
Olivi
e
r M
a
rin
builtin-rm:
f
ix index lock f
i
le path
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-18
Juni
o
C Hamano
Merg
e
branch 'sp/maint-index-pac
k
' int
o
main
t
commit
|
commitdiff
|
tree
2008-07-18
Juni
o
C H
a
mano
http-fet
c
h: do not SEGV afte
r
f
e
tching a bad
pack idx
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-18
Ju
n
io C Hamano
rev-list: honor --quiet
o
ption
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-18
J
u
nio
C H
a
mano
built
i
n-remot
e
.
c: fix
earlier "skip_prefi
x
()" conversi
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-18
S
t
ephan Beyer
api
-
ru
n
-comma
n
d
.
txt: typ
o
fi
x
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-17
Petr Ba
u
d
is
Doc
u
mentati
o
n/R
e
lNotes-1
.
6
.
0
.
txt:
Expand on the incompatible
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-17
J
u
n
io C Hamano
r
e
r
ere
.
aut
o
up
d
ate: change the me
s
sage when a
u
toupdate
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-17
Junio C Hamano
mailinfo: off-by-one
fix for [
P
A
T
CH (foobar)] remova
l
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-17
J
u
nio C
Hamano
re
a
d-cac
h
e
.
c: typofi
x
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-17
Junio C H
a
mano
Updat
e
draft r
e
lea
s
e no
t
e
s
for
1
.
6
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-17
Avery Penn
a
run
Reword "
y
o
u
r branch has di
v
erged
.
.
.
" l
i
nes to reduce
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-17
Junio
C Hamano
Merge branch
'mv/dashless'
commit
|
commitdiff
|
tree
2008-07-17
Junio C
H
amano
Merge branch 'ls/mailinfo'
commit
|
commitdiff
|
tree
2008-07-17
Pe
t
r Baudis
Do
c
umentation/git-submodule
.
tx
t
:
Add Description sect
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-17
Junio C H
a
mano
M
e
rge b
r
an
c
h 'sb/dashle
s
s'
commit
|
commitdiff
|
tree
2008-07-17
Junio C Hamano
Merge branch
'
r
s
/arc
h
ive
'
commit
|
commitdiff
|
tree
2008-07-17
Junio C Hamano
Merge bran
c
h
'ag/bl
a
m
e
'
commit
|
commitdiff
|
tree
2008-07-17
J
u
nio C Hamano
Merg
e
branc
h
'
r
s/
r
ebase-checkout-not-so
-
quiet'
commit
|
commitdiff
|
tree
2008-07-17
Juni
o
C Hamano
Merge bran
c
h '
s
p/maint-index-
p
ack'
commit
|
commitdiff
|
tree
2008-07-17
Junio C Ham
a
no
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2008-07-16
Junio C Hamano
Star
t
prep
a
ring 1
.
5
.
6
.
4
r
elease n
o
tes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
Johannes Schin
d
el
i
n
git fetch-pack:
do no
t
complain a
b
out
"
no common
commits
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
Junio C Haman
o
Merge bran
c
h 'js/ma
i
nt-pr
e
tty-ma
i
lmap' into
mai
n
t
commit
|
commitdiff
|
tree
2008-07-16
Junio C Haman
o
Me
r
ge bran
c
h 'sp/mai
n
t-bash-completio
n
-optim' into
.
.
.
commit
|
commitdiff
|
tree
2008-07-16
Junio C Hamano
Me
r
ge branch 'sp/mai
n
t
-
pa
c
k-memuse' in
t
o ma
i
nt
commit
|
commitdiff
|
tree
2008-07-16
Junio C Ha
m
ano
M
e
rge
b
ranch 'ls/maint
-
ma
i
li
n
f
o-patch-label' into maint
commit
|
commitdiff
|
tree
2008-07-16
Jun
i
o C Hamano
Merge branch 'js/main
t
-daemon
-
syslog'
into main
t
commit
|
commitdiff
|
tree
2008-07-16
S
tephan Beyer
reba
s
e-i: keep old pare
n
t
s when preser
v
i
n
g
m
erg
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
J
o
h
ann
e
s Sixt
t7600-merge
:
U
se test_expe
c
t
_fail
u
r
e
t
o
test option
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
D
m
i
t
ry Pot
a
pov
Fix
b
uffer overflow in prepare_attr_stack
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
Dmi
t
r
y
Potap
o
v
Fix buffer o
v
erflow
i
n g
i
t diff
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
D
m
itry Po
t
apov
Fix buffer overflow in g
i
t-grep
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
Su
n
gHyun
Nam
t/Ma
k
efil
e
: use specified sh
e
ll wh
e
n ru
n
ning
aggregation
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
Lars
N
oschinski
git-cvsserver: fi
x
cal
l
t
o nonexistant
c
lea
n
upWorkDir()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
Na
n
a
k
o Shiraishi
p
arse-options
.
c
: m
a
ke check_typos() static
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
Nan
a
ko
S
hiraishi
builti
n
-describe
.
c:
m
ake a g
l
obal variable "patt
e
rn
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
Na
n
ako Shiraishi
c
ache-tree
.
c
: make cache_tre
e
_find() static
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
P
e
tr Baudis
Documenta
t
ion/
g
it-cherry
-
pick
.
txt et
a
l
.
: Fi
x
mi
s
leading
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
Junio
C
Hamano
t/aggregate-result
s
: whites
p
ace fix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
E
ric Won
g
t/lib-gi
t
-svn: fix SV
N
_HTTPD
tests to wor
k
w
i
th "trash
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
Junio
C Ham
a
no
Merge bra
n
ch
'mv/merge-in-c'
commit
|
commitdiff
|
tree
2008-07-16
Junio C
H
ama
n
o
Mer
g
e branc
h
'
a
g
/rewrite_one'
commit
|
commitdiff
|
tree
next