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
provide more errors for the "merge into empty head" case
2008-08-22
Paolo Bonzini
pr
o
v
i
de more er
r
o
r
s for the "merge into empty head
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Sh
a
wn O
.
P
e
arce
Make
r
eflog query '@{1219
1
88291}' a
c
t as '@{2008
.
8
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Neil
Roberts
conf
i
g
.
mak
.
in: Pas
s
on LDF
L
AGS from confi
g
ure
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Jun
i
o
C Hamano
Me
r
ge branch '
m
aint'
commit
|
commitdiff
|
tree
2008-08-21
Brando
n
Casey
c
o
mpat/
s
nprintf
.
c
:
han
d
le s
n
pri
n
tf's tha
t
alway
s
r
eturn
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Johan He
r
l
and
Teach "git
d
iff -
p
"
H
T
ML funcname patterns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Kirill Sm
e
lkov
Tea
c
h "gi
t
diff -p" Python f
u
ncname p
a
tterns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Eric Wong
gi
t
-
svn: fix d
c
ommit to ur
l
s
with embedded use
r
n
ames
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Juni
o
C
Hamano
Merge branch 'ml/submodule-fore
a
ch'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Ha
m
ano
M
erge branch
'pm/log-ex
i
t-code'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Ha
m
ano
Me
r
ge branc
h
'sb/commit-tree-minileak'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
Mer
g
e b
r
anch 'pb/reflog-dwim
'
commit
|
commitdiff
|
tree
2008-08-21
Junio C
H
amano
Merge branch 'jc/add-stop-
a
t-sy
m
li
n
k'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Ha
m
a
no
M
e
rge branch 'kh/dif
f
-tree'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Ha
m
a
n
o
M
e
rge branch 'mg/count-objec
t
s'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Ha
m
a
n
o
Merge br
a
nch 'mz/push-verbo
s
e'
commit
|
commitdiff
|
tree
2008-08-21
Junio C
H
amano
Merg
e
branch 'jc/index-extended-flag
s
'
commit
|
commitdiff
|
tree
2008-08-21
Junio
C
H
a
mano
Merge
bran
c
h 'cc/merge-base
-
man
y
'
commit
|
commitdiff
|
tree
2008-08-21
Junio
C Hamano
Merge bra
n
c
h 'jc
/
test-deep
e
r'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Haman
o
Merge bran
c
h
'js
/
parallel-test'
commit
|
commitdiff
|
tree
2008-08-21
Brand
o
n Casey
revision
.
h: make show_early
_
out
p
ut an extern whic
h
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio C Haman
o
Update d
r
af
t
release notes for
1
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Ju
n
io C Hamano
M
erge
b
r
anch 'maint'
commit
|
commitdiff
|
tree
2008-08-20
Ju
n
io C Hamano
Update
draft release notes for 1
.
6
.
0
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Tarmigan Casebol
t
A
d
d hi
n
ts to revert documentation about other ways
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Johannes
Sixt
Install temp
l
ates wit
h
the us
e
r and group of the installing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
J
u
nio C Hamano
"
g
it-merge": allow fast
-
f
orwarding in a stat-dirty
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio C Haman
o
c
o
mpl
e
tio
n
:
fi
n
d out supported me
r
ge
strategies correctly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Je
f
f King
decorate: allow const objec
t
s to be decora
t
ed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio
C
Ha
m
ano
fo
r
-
e
ach-ref
:
cope wi
t
h tags
with inc
o
m
p
le
t
e
lines
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
d
i
f
f --check: do not get confused by new
blank l
i
nes
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
M
erge branch '
b
d/diff-strbuf'
commit
|
commitdiff
|
tree
2008-08-20
J
unio
C Hama
n
o
Mer
g
e branch 'd
p
/hash-literall
y
'
commit
|
commitdiff
|
tree
2008-08-20
Ju
n
i
o C Haman
o
M
erg
e
branch 'js/checkout-
d
w
i
m
-
local'
commit
|
commitdiff
|
tree
2008-08-20
Junio C
H
amano
Merge branch 'ph/en
a
ble-threaded'
commit
|
commitdiff
|
tree
2008-08-20
Junio C Ha
m
ano
Mer
g
e bra
n
ch 'jk/page
r
-swap'
commit
|
commitdiff
|
tree
2008-08-20
Juni
o
C Hamano
M
e
rg
e
branch 'rs
/
imap'
commit
|
commitdiff
|
tree
2008-08-20
Junio C
Hamano
Merge br
a
nch
'js/mingw-st
a
t'
commit
|
commitdiff
|
tree
2008-08-20
Jim Meyering
remote
.
c: remove useless if-befor
e
-
f
r
ee test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Jeff King
mailinfo: avoi
d
v
iolating strbuf assertio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Jim Meyer
i
ng
rewor
d
--full-index descr
i
ption
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Jim Meyering
SubmittingP
a
tch
e
s: fix a typo
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Jim
Me
y
ering
add boolean d
i
ff
.
su
p
p
r
ess
-
blank-empty con
f
ig op
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
J
im
M
eyering
git format-patch: avoid u
n
derrun w
h
en forma
t
.
h
e
a
d
ers
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-19
J
u
nio C Ha
m
a
no
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-08-19
Br
a
ndon Casey
t1002-
r
ead-t
r
ee-m-u-2way
.
sh: use 'git
d
iff -U0' rather
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-19
Mar
c
us Grie
p
U
pd
a
te
t
/
.
g
i
tig
n
ore to
i
gn
o
re
all
t
r
ash dir
e
ctories
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-19
Johannes Six
t
R
e
vert
"
Windows: Use a custo
m
ized
struct s
t
at th
a
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-19
Junio C Hamano
comp
a
t:
introduce
on_disk_bytes()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-19
Robert
Schi
e
le
adapt git-cvss
e
rver
m
anpage to dash-fre
e
syntax
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-19
Don Zickus
mai
l
info: re
-
f
i
x
M
I
ME multipa
r
t boundary parsin
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Mark Levedahl
git-sub
m
odule - Add 'fore
a
ch' subcommand
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Ste
p
han Bey
e
r
Fix co
m
m
it_tree() b
u
f
f
er leak
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Peter Valdemar Mør
c
h
T
eac
h
git log --exit-
c
ode to retu
r
n an appropriat
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Peter Va
l
demar
Mørch
Teac
h
git log
-
-
c
heck to ret
u
rn an appropriate exi
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Piet
e
r de Bie
builtin-reflo
g
: Allo
w
re
f
log expire to name partial ref
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Junio C Hamano
Start 1
.
6
.
1 c
y
c
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Ju
n
io C Ham
a
no
Start
1
.
6
.
0
.
X maintenance series
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Junio C Hamano
GIT 1
.
6
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Junio
C Ha
m
a
n
o
M
e
r
ge
git-gui 0
.
11
.
0
commit
|
commitdiff
|
tree
2008-08-17
Junio C Hamano
Merge br
a
n
ch 'ak/p4'
commit
|
commitdiff
|
tree
2008-08-17
Marcus Griep
count-obje
c
ts:
A
dd total pack s
i
ze
to verbose output
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Junio
C
H
a
man
o
te
s
ts: use
$
TEST_DI
R
EC
T
ORY
to refer to the
t
/ directory
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Mar
e
k
Zawirsk
i
Mak
e
push mor
e
verbose ab
o
ut illegal co
m
bi
n
ation
o
f
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Junio C Ham
a
n
o
i
n
dex: f
u
t
u
re proof for "extended"
i
ndex entries
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Robert Blum
git-p4: chd
i
r
now
prop
e
rly s
e
t
s
PWD envir
o
nment varia
b
le
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Stephan Beyer
Improve error output of git-reba
s
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Miklos Vaj
n
a
t9300: re
p
lace '!' w
i
th test_must_
f
ail
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
J
u
nio
C Hamano
Merg
e
git://git
.
kernel
.
org/p
u
b/scm/gitk/gitk
commit
|
commitdiff
|
tree
2008-08-16
Ma
r
c
us Gr
i
ep
Git
.
p
m
: M
a
ke
File
:
:Spe
c
and File::Temp requiremen
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-16
Miklos Vajna
Documen
t
ation:
document th
e
pager
.
* configuration
s
et
t
ing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-16
Stephan
Be
y
er
git-stash:
i
mprov
e
synopsi
s
in he
l
p and man
u
al
p
ag
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-16
Eri
c
Blake
Makefil
e
:
building g
i
t in cygwin 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-16
Step
h
an
B
eyer
gi
t
-am: ignore --binary option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-16
Marcus Griep
bash-completion: Add no
n
-
c
o
mmand git help files to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-15
Alex Riese
n
Fix
t3700 on filesystems which do n
o
t support question
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-15
Anand Kumria
U
t
ilise
our new p4_r
e
ad_pipe
and
p
4
_write_pipe wrappers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-15
An
a
n
d Kumria
Add p4 read_pipe and
writ
e
_pipe wrappers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-15
Le
e
Mar
l
ow
b
ash completio
n
:
Add '--mer
g
e
'
lo
n
g opt
i
o
n
for 'git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-15
Lee Marlo
w
bash completion: Add co
m
plet
i
on for 'git mer
g
etool'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-15
M
att McCutche
n
gi
t
fo
r
mat-
p
atch
d
ocumentation
:
c
l
arify what --cover
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-15
Eric Raible
bash completion: 'git
apply' should use
'
f
i
x'
no
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-14
Junio
C Hamano
x
diff-interface:
h
i
de the wh
o
le "xdiff
_
em
i
t_state"
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-14
Brian Downin
g
Use str
b
u
f
for
struct
xdiff_emit_
s
tate's remainder
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-14
Brian
Dow
n
in
g
Make
x
di
_
diff
_
outf interface for running xdiff_outf
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-14
J
unio
C
Hamano
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2008-08-14
Brandon Casey
t5304-prune:
a
dju
s
t file m
t
ime b
a
sed
on system ti
m
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-14
Brandon Cas
e
y
test-parse-option
s
: use appropriate cast in length_
c
allback
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-14
Kevin Bal
l
ard
Fix
esca
p
ing
of glob spec
i
al characters in
p
athspe
c
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-13
T
h
omas Ra
s
t
rebase
-i -p: fix
parent rewriting
commit
|
commitdiff
|
tree
2008-08-13
Thomas Rast
rebas
e
-i -p:
h
andle index and
w
o
r
kdi
r
c
or
r
ectl
y
commit
|
commitdiff
|
tree
2008-08-13
Junio C Hamano
GIT
1
.
6
.
0
-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-13
Junio
C
Ha
m
ano
Merge branch '
m
a
i
nt'
commit
|
commitdiff
|
tree
2008-08-13
Junio C Ham
a
n
o
Do not talk about "di
f
f" i
n
rev-
l
ist do
c
umentati
o
n
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-13
Junio C Hamano
M
erge
git://g
i
t
.
bogomip
s
.
org/
g
it-svn
commit
|
commitdiff
|
tree
2008-08-13
Thomas Rast
D
ocument
a
ti
o
n: rev-l
i
st-optio
n
s: Rewr
i
te s
i
mplifi
c
ation
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-12
G
u
staf Hendeby
T
e
ach git dif
f
abo
u
t
B
ibTeX head hunk patterns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-12
G
u
s
taf Hendeby
gitattri
b
u
tes: D
o
cument bui
l
t in hunk header
p
a
tterns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-12
Stephen
R
.
va
n
den
.
.
.
g
i
t-daem
o
n
:
SysV needs
t
he si
g
n
a
l handl
e
r reinstated
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-12
Ju
n
io C Ha
m
ano
diff
-
-ch
e
ck: do not unconditionally
c
om
p
lain about
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next