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 to show that show-branch misses out the 8th column
2008-07-23
Joha
n
n
es Schi
n
delin
Add test to
s
how that show-b
r
anc
h
misses out
t
h
e
8
t
h
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Jo
h
annes Schi
n
d
e
l
in
Igno
r
e dirty submodu
l
e st
a
t
e
s
i
n "
g
it p
u
ll
-
-reba
s
e"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Brandon Casey
t/t
4
2
0
2-log
.
sh: add
n
ewline at en
d
of file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Brandon Casey
t7502-c
o
mm
i
t
.
s
h: rearr
a
n
ge test to make more por
t
able
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Brando
n
Casey
t3200,t7
2
01: replace
'
!'
w
i
t
h
test_must_fa
i
l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Brando
n
C
asey
t4116-apply-r
e
verse
.
s
h:
use $TAR rather tha
n
t
a
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Br
a
n
d
on Casey
t/: Repla
c
e d
i
f
f
[-u|-U0]
with
t
est_cmp to allow compil
a
tion
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Miklos Vajn
a
t760
1
: extend
th
e
'merge picks up the b
e
st result'
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Daniel Barkal
o
w
In perforce,
R
CS keywords are case-sensi
t
ive
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Alex Riesen
Allow pager of diff command be enabled/disabled
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-22
Johannes Schindelin
Fi
x
two leftovers from
p
ath_list->st
r
ing_list
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-22
Olivier Marin
git am --skip: cle
a
n
the index while preserving
local
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-22
Pi
e
r
re H
a
bouzit
git-su
b
m
o
dul
e
: move ill placed shift
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-22
Pierre
Ha
b
o
u
z
it
builtin-
m
erge: add missi
n
g st
r
ucture initializati
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-22
M
iklos Va
j
na
b
u
iltin-me
r
ge
:
give a proper error
message fo
r
i
n
v
alid
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-22
Junio C Ha
m
ano
test
s
:
do not rely on
e
xte
r
nal "pa
t
c
h
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-22
N
ikola
j
Schumache
r
Don't cut off l
a
s
t
character
of com
m
i
t de
s
c
r
iptions
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-22
O
livier M
a
rin
parse-options: fix segmentation fault when a r
e
quired
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-22
Philippe Bruhat
.
.
.
mailinfo: better parse ema
i
l
adre
s
se
s
c
ontaing parentheses
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-22
Olivier Marin
g
i
t
-a
m
: r
e
mov
e
dash from help message
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-22
Junio C Haman
o
Revert "make git-status use a pager
"
commit
|
commitdiff
|
tree
2008-07-22
Jonathan
Nieder
git-diff(1):
"
--c" ->
"--cc" typo
fix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-22
Johannes S
c
hindeli
n
Re
n
ame pat
h
_list to string_
l
i
st
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-22
Johannes Schindelin
Rename
.
git/rebase to
.
g
i
t/re
b
ase-ap
p
ly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-21
Jun
i
o C Hama
n
o
Update my e-mail
addre
s
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-21
Junio C Hamano
Merge b
r
anch 'ap/trackin
f
o'
commit
|
commitdiff
|
tree
2008-07-21
Junio
C
Ham
a
no
Mer
g
e branch 'jc/rerere-auto-
m
ore'
commit
|
commitdiff
|
tree
2008-07-21
Junio C
H
a
mano
Merge bran
c
h
'ns/
a
m
-
abort'
commit
|
commitdiff
|
tree
2008-07-21
Junio C
H
am
a
no
Merge br
a
n
ch '
j
c/add-addremove'
commit
|
commitdiff
|
tree
2008-07-21
Junio C
H
ama
n
o
"
n
e
e
d
s
up
d
ate" considere
d
harmf
u
l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-21
Junio C Hamano
Move read_i
n
_
f
u
l
l
() an
d
write_in_full() to wra
p
per
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-21
J
u
n
i
o C Hamano
Link sh
e
ll
w
ith compat layer functions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-21
Juni
o
C
H
amano
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2008-07-20
Dmitry Potapov
git-svn: fi
x
git svn i
n
fo to wo
r
k wit
h
out
argume
n
ts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-20
Mi
c
he
l
e
B
allabio
buil
t
in-pus
h
.
c: Clea
n
up -
u
se OPT_BIT(
)
and remov
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-20
M
ichele Ballabio
builtin-merge
.
c: Fix o
p
tion parsin
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-20
Jon
a
than Nieder
fix usage string for g
i
t grep
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-20
Mi
k
los Vajna
Teach 'git merge' that some me
r
ge
s
trategies
n
o lon
g
er
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-20
L
a
r
s
N
o
s
chinski
cvss
e
rver: A
d
d testsuite f
o
r packe
d
refs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-20
Junio C Hama
n
o
refresh-index
:
f
ix bitmask assig
n
m
ent
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-20
Juni
o
C Hamano
gi
t
-a
d
d --all: d
o
cu
m
ent
a
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-20
J
unio C Hama
n
o
g
i
t
-add --all:
t
ests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-20
Ju
n
io
C Hamano
gi
t
-ad
d
--
a
ll: add all files
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-20
Junio C Hamano
b
uiltin-add
.
c: res
t
ructure t
h
e code for mainta
i
nability
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Junio C
Hamano
Gettin
g
closer t
o
1
.
6
.
0-rc0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Na
n
ako Shirais
h
i
git am --abort
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Junio C Ham
a
no
Merge branch 'm
a
int'
commit
|
commitdiff
|
tree
2008-07-19
Alexander Gavrilov
Su
p
port gitlinks in fa
s
t-im
p
o
r
t
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Ju
n
i
o
C Hamano
.
mai
l
map
upd
a
te
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Pet
r
Baudis
Documentation/g
i
t
-
merge
.
txt: Partial rewrite of H
o
w
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
René S
c
harfe
archive: remove u
n
us
e
d headers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
René Scharfe
archive:
make zip c
o
mpression le
v
e
l
indep
e
ndent from
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Petr
Baud
i
s
Doc
u
m
ent
a
tion: H
o
w to ignore local chan
g
es i
n
tracked
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
P
etr
B
audi
s
Documenta
t
ion/git-su
b
modul
e
.
txt: F
u
rt
h
er cla
r
ify the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
P
eter Harris
Add AN
S
I con
t
rol code
emulation
f
or the
Windows c
o
nsole
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Johannes S
i
x
t
builtin
-
cl
o
ne: re
w
rite guess_dir_name()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Eric R
a
i
ble
Teach
l
ooku
p
_prog not
to se
l
ect dir
e
ctories
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Fabi
a
n Emmes
t
estsuite for cvs co -c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Lar
s
N
osch
i
nski
cvs
s
erver: Add cvs
c
o -c suppo
r
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Lars Nosch
i
ns
k
i
cvsserver: Add support for packed refs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Fa
b
ian Emmes
Tes
t
suite: Unset CVS_SERVER
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Stephan Bey
e
r
Link git-shel
l
only t
o
a sub
s
et of
l
ibgit
.
a
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
J
u
nio C Ham
a
no
t9001
(
s
end-email):
Do not use har
d
c
o
ded /bin/
s
h in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Junio C Ha
m
ano
GIT 1
.
5
.
6
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Olivier Marin
b
uil
t
i
n
-
rm: fix index
lock file
p
a
th
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-18
Junio C Hama
n
o
Merge
b
ranch 'sp/maint-index-pac
k
' into m
a
int
commit
|
commitdiff
|
tree
2008-07-18
Junio C Hama
n
o
ht
t
p-fetch:
do not SE
G
V
a
fter fet
c
hing a
b
a
d
pack idx
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-18
Junio C Hamano
re
v
-list: honor --quiet option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-18
Juni
o
C
Hamano
buil
t
i
n-
r
emote
.
c: fix earlier "skip_pr
e
f
i
x()" con
v
ersi
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-18
Stephan
B
e
yer
api-run-co
m
mand
.
t
xt:
t
y
pofix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-17
Petr Baudis
Documentation/Re
l
N
o
t
e
s-1
.
6
.
0
.
t
x
t: E
x
pand on the incompatible
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-17
J
u
n
i
o C Hama
n
o
rere
r
e
.
autoupdate:
c
hange
the message
w
hen autoupdate
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-17
Junio
C
Ha
m
a
no
mailinfo: off-by-
o
ne fi
x
for [PATCH (foobar)] r
e
mo
v
a
l
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-17
J
u
nio C Hamano
read-cac
h
e
.
c: typofix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-17
Junio
C
Hamano
Update draft relea
s
e no
t
es for
1
.
6
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-17
Ave
r
y Pennarun
Reword "
y
o
u
r branch has diverged
.
.
.
" lines to reduce
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-17
Junio C Hamano
M
erge b
r
anch 'mv/dashless'
commit
|
commitdiff
|
tree
2008-07-17
Junio C
Hamano
Merge branch 'ls
/
mailinfo'
commit
|
commitdiff
|
tree
2008-07-17
P
e
tr Baudis
Documentation/git-submo
d
ule
.
txt: Add
Des
c
ri
p
tion section
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-17
Ju
n
i
o C Hama
n
o
Merge
b
ranch 'sb/
d
a
sh
l
ess'
commit
|
commitdiff
|
tree
2008-07-17
Jun
i
o
C
Hamano
Merge branch 'rs/a
r
chi
v
e'
commit
|
commitdiff
|
tree
2008-07-17
J
unio C Hamano
Merge
branc
h
'ag/bla
m
e'
commit
|
commitdiff
|
tree
2008-07-17
Jun
i
o
C
Hamano
Merge branch 'rs
/
reb
a
se-checkout-not-so-quiet'
commit
|
commitdiff
|
tree
2008-07-17
Junio C Hamano
Merge branch 'sp/maint-index-
p
ack'
commit
|
commitdiff
|
tree
2008-07-17
J
un
i
o
C Hamano
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2008-07-16
Junio C Hamano
Start prepar
i
n
g
1
.
5
.
6
.
4
relea
s
e
note
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
J
ohanne
s
S
chinde
l
in
g
i
t fet
c
h-pa
c
k: do not comp
l
ain
about "no com
m
on commits
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Junio C Hamano
Merge branch 'js/ma
i
nt-pretty-m
a
ilma
p
' into maint
commit
|
commitdiff
|
tree
2008-07-16
Junio C Hamano
Merge branch 'sp/maint-bash-
c
ompletion-opt
i
m' i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2008-07-16
Junio C Hamano
Mer
g
e branch
'
s
p/maint-pack-
m
emuse' int
o
main
t
commit
|
commitdiff
|
tree
2008-07-16
J
un
i
o C Hamano
Merge
b
ranch 'ls/ma
i
nt-mailinfo-patch-label' into maint
commit
|
commitdiff
|
tree
2008-07-16
Junio C Hamano
Merge br
a
nch 'j
s
/ma
i
nt-da
e
m
o
n-sysl
o
g' into maint
commit
|
commitdiff
|
tree
2008-07-16
Stephan Beyer
rebase
-
i: keep old parents when preserving merg
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Johannes Si
x
t
t7
6
00-
m
erge: Us
e
test_expec
t
_failur
e
to test option
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Dmitry Potapov
Fix
b
uffe
r
overflow in prepar
e
_
attr_
s
tac
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Dmitry Potapov
F
i
x
buffer overflow
i
n git diff
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Dmitry Potapov
Fix buffer
ov
e
r
flow in git-g
r
ep
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
SungHyu
n
Nam
t/M
a
k
e
file: use specified shell w
h
en runni
n
g
agg
r
egat
i
on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Lar
s
Noschinski
git-cvsserver: fix call to nonexistant cleanupWorkDir()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Na
n
ako Shiraishi
p
arse-o
p
t
i
ons
.
c: make check_t
y
pos() static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next