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
Split out merge_recursive() to merge-recursive.c
2008-08-20
Junio C Hamano
Up
d
ate
d
r
aft release
n
o
t
es for 1
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2008-08-20
Junio
C Hama
n
o
Update draft rel
e
ase not
e
s for 1
.
6
.
0
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
Tarmigan Casebo
l
t
A
dd hints to
r
evert documentatio
n
about other ways
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
Joh
a
nnes S
i
xt
In
s
tall t
e
mplat
e
s with the user and
g
roup of the installing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
Junio C H
a
mano
"git-merge": all
o
w fast-forwarding in a stat-dirty
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
Ju
n
io C
H
amano
completion
:
find out support
e
d
me
r
ge strategie
s
cor
r
e
ctly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
Jeff King
decorate: a
l
low const
o
b
j
ec
t
s t
o
be decorated
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
Jun
i
o C Hamano
for-each-ref
:
cope w
i
th tags
w
ith incomplete
l
in
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
J
u
nio
C Haman
o
diff --ch
e
ck: do n
o
t get conf
u
s
e
d by new blank lines
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
Junio
C Hamano
Build-in "g
i
t-
s
hell"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
Mer
g
e branch
'
bd/diff-strbuf'
commit
|
commitdiff
|
tree
2008-08-20
J
unio C Hamano
Merge branc
h
'dp/hash-literally'
commit
|
commitdiff
|
tree
2008-08-20
Junio
C
H
amano
Merge branch '
j
s
/
checkout-dwim-local'
commit
|
commitdiff
|
tree
2008-08-20
J
unio C Hama
n
o
Merge
branch 'ph/e
n
a
ble-threaded'
commit
|
commitdiff
|
tree
2008-08-20
Junio C H
a
mano
Merge branch 'jk
/
pager-
s
w
ap
'
commit
|
commitdiff
|
tree
2008-08-20
Junio
C
Hama
n
o
Merge branch 'rs/imap'
commit
|
commitdiff
|
tree
2008-08-20
Juni
o
C Hamano
Merge bra
n
c
h
'
js/mingw-stat
'
commit
|
commitdiff
|
tree
2008-08-20
Jim Meyering
r
emote
.
c:
remove useless if-before-free test
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
Jeff
K
ing
m
ail
i
nfo: avoid violating
s
trbuf assertion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
Jim Meyering
rewor
d
--full-index description
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
Jim Meyering
Subm
i
tti
n
gPatches
:
f
i
x a typo
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
Jim Meye
r
ing
add boo
l
ean
d
iff
.
suppress-blank-emp
t
y config op
t
i
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
Jim Meyering
git
f
o
rm
a
t-
p
atch
:
a
void
underrun when format
.
headers
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
Ju
n
io C Hamano
she
l
l: d
o
not play du
p
l
i
cated definition
games to shrink
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-19
Junio
C
Hamano
M
e
rge br
a
nc
h
'ma
i
nt'
commit
|
commitdiff
|
tree
2008-08-19
Brandon
Casey
t1002-read-tree-
m
-u-2way
.
s
h
: use 'g
i
t di
f
f -U0' ra
t
her
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-19
Ma
r
c
u
s
Griep
Up
d
ate t/
.
gitignore to ignore a
l
l tra
s
h director
i
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-19
Johannes
Sixt
Revert "
W
indows: Use
a
customiz
e
d struct stat that
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-19
Junio C
H
aman
o
c
o
mpat: introdu
c
e on_
d
isk_bytes()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-19
R
o
bert Schiele
adapt git-cvs
s
erve
r
m
anpage to d
a
sh-free syntax
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-19
Don Zickus
mail
i
nf
o
: re-fix MIME multipa
r
t boundary parsing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-18
Stephen R
.
van den
.
.
.
g
it-daemon:
rewrite kindergarden,
n
ew opti
o
n --max
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-18
Stephe
n
R
.
van den
.
.
.
git-daemon: Simplify dead-children reaping logic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-18
Step
h
e
n
R
.
van den
.
.
.
g
i
t
-
daem
o
n: use LOG_PID, simplify logging
c
ode
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-18
S
t
e
p
h
e
n R
.
van den
.
.
.
git-d
a
em
o
n
:
c
all l
o
gerror() inst
e
ad
of error()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-17
Ma
r
k
Levedahl
git-s
u
bmodule
- Ad
d
'foreach
'
subcommand
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-17
Steph
a
n
Beyer
Fix commit_tree() b
u
ffer leak
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-17
Peter Valdemar Mørch
Teach
git l
o
g -
-
exit-code to ret
u
rn an appropriate
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-17
P
eter Vald
e
mar Mør
c
h
Teach git log --check t
o
retu
r
n
an
appropri
a
t
e
exi
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-17
Piet
e
r de
B
ie
builtin-reflog: Allow r
e
flog expire to
name
p
art
i
al
ref
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-17
Junio C Ham
a
no
S
t
a
r
t 1
.
6
.
1 cycle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-17
J
uni
o
C Ham
a
no
Start 1
.
6
.
0
.
X maintenance
ser
i
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-17
Juni
o
C H
a
mano
GI
T
1
.
6
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-17
J
u
n
io C
H
am
a
no
M
e
r
g
e
git-
g
ui 0
.
11
.
0
commit
|
commitdiff
|
tree
2008-08-17
Junio C Hamano
Merge branch '
a
k/p4'
commit
|
commitdiff
|
tree
2008-08-17
Marc
u
s Griep
count-objec
t
s: Add to
t
a
l pack size t
o
verb
o
s
e
outp
u
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-17
Junio C Hamano
tests
:
u
se $TEST_DIRE
C
TORY
to refer to the t/
directo
r
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-17
Marek Zawirski
Make push
more verb
o
se about illegal
combination of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-17
Jun
i
o C Hamano
i
nde
x
: fut
u
re proof
for "e
x
tended" inde
x
entries
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-17
Robe
r
t Blum
git-p4: chdir no
w
pro
p
erly sets PWD environment variabl
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-17
Stephan Beyer
Improve error output of git-
r
ebase
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-17
Miklos
V
a
j
na
t9300: replace '!' with te
s
t_must_fail
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-17
Ju
n
io
C Hamano
Me
r
ge git://git
.
kernel
.
o
r
g/
p
u
b/scm/gitk/gitk
commit
|
commitdiff
|
tree
2008-08-16
Marcus Grie
p
Git
.
pm: M
a
ke F
i
le::Spec
a
nd File::Temp req
u
irement
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-16
Miklos
Vajna
Documentation: document
t
he pager
.
* configuration setting
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-16
Step
h
an
Beyer
gi
t
-stash: improve syno
p
sis in help
a
nd
manual
p
age
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-16
Eric
B
l
ake
Makefi
l
e: building git in c
y
gwin 1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-16
St
e
phan Beyer
git-am: ig
n
ore
--binary opt
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-16
Marcus Grie
p
b
a
sh-
c
ompletion: A
d
d no
n
-com
m
and git help files
t
o
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-15
Alex Riesen
Fix t3700 on f
i
les
y
st
e
ms w
h
i
c
h
d
o
n
ot s
u
p
p
o
r
t
questi
o
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-15
Anan
d
Kumria
Utilise our
new p
4
_rea
d
_
pipe
and p4_wr
i
te_pipe wr
a
pper
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-15
Anand Kumria
Add p4 read_pipe and writ
e
_p
i
pe w
r
appers
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-15
Lee Marlow
b
ash completion: Add
'-
-
mer
g
e'
l
ong op
t
i
o
n
for 'git
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-15
Lee
M
arlow
bash com
p
letion:
Add
c
ompletion for 'git
m
e
rge
t
oo
l
'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-15
Matt
McCut
c
h
e
n
gi
t
format
-
p
a
tch documen
t
ation: clarif
y
what --cover
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-15
Eric Ra
i
b
l
e
bash
comp
l
eti
o
n: 'g
i
t
a
pply' shou
l
d us
e
'fix' not
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-14
Junio
C H
a
m
a
no
xdiff-interfa
c
e: hide the whole
"
xdiff_e
m
it_state"
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-14
Gustaf H
e
ndeby
Upda
t
e
.
giti
g
n
ore to igno
r
e git-hel
p
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-14
Brian Do
w
ning
Use strbuf for struct xdiff_emit_sta
t
e's remainde
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-14
Bria
n
Do
w
ning
Mak
e
xdi_diff_outf interface for running xdiff_outf
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-14
Junio C Hamano
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2008-08-14
Brandon
Casey
t5304-prune: adjust file mtime based o
n
s
y
stem time
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-14
Brandon Ca
s
ey
test-parse-options: use appropriate
c
a
st in
l
eng
t
h_
c
allbac
k
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-14
Kev
i
n Ball
a
rd
Fix es
c
aping of glob spec
i
a
l ch
a
racters in pathspecs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-13
Thomas Rast
reb
a
se
-
i -p:
f
ix par
e
nt re
w
r
i
ting
commit
|
commitdiff
|
tree
2008-08-13
T
h
o
mas Rast
reb
a
s
e -i
-
p
:
handl
e
ind
e
x
a
nd w
o
rkdir correctly
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 Haman
o
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2008-08-13
Junio C Ham
a
n
o
Do not talk about "diff" in rev-list d
o
cume
n
tati
o
n
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-13
Junio C Ham
a
no
Merge git://git
.
b
o
go
m
ips
.
or
g
/git-svn
commit
|
commitdiff
|
tree
2008-08-13
Thoma
s
Rast
Documentation: rev-list-
o
pti
o
ns:
Rewrite si
m
pl
i
fication
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-12
Gustaf Hendeby
Teach
gi
t
d
iff about BibTeX
h
ead hunk patterns
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-12
G
ustaf Hendeby
gi
t
attributes: Document
b
u
ilt in h
u
nk h
e
ader
p
atterns
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-12
Stephen R
.
van den
.
.
.
g
it-daem
o
n: SysV needs the signal
handler reinst
a
ted
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-12
Shawn O
.
Pear
c
e
pack-objects: Allow m
i
ssing ba
s
e obje
c
ts when creating
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-12
Junio C Hamano
diff
-
-
check
:
do not unconditionally co
m
p
lain about
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-12
Junio C
H
a
m
an
o
Merge
bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2008-08-12
Anand Kumria
P
ut i
n
the two other configuration eleme
n
ts found in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-12
An
a
nd Kumr
i
a
Put some
documentation in abo
u
t
the parameter
s
that
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-12
Anand Kumr
i
a
Mov
e
g
i
t
-
p
4
.
s
y
n
c
FromOrigin
i
n
t
o
a c
o
nfigur
a
t
ion parameters
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-12
Anand Kumria
Con
s
isten
t
ly use
'git-p4' for t
h
e co
n
f
iguration entri
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-12
Anand Ku
m
ria
I
f
the u
s
e
r
has configure
d
various
p
a
r
ameters, use
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-12
A
na
n
d
K
u
m
ria
Switch to using 'p4_
b
uild_cmd'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-12
Anand Kumria
If
we are in verbose mode, outp
u
t what we are ab
o
ut
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-12
Anand Kumria
Add a single command t
h
a
t
will be used
t
o
construct
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-12
Anand Kum
r
ia
U
tilise the new 'p4_system' fu
n
ct
i
on
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-12
Anan
d
Kumr
i
a
Have
a command that specifical
l
y invokes '
p
4' (via
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-12
A
nand Kumria
U
t
ilise the new 'p
4
_read_pipe_lines' command
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-12
Ana
n
d Kum
r
ia
Create
a specifi
c
v
er
s
ion of the read_
p
ip
e
_lines command
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next