repo.or.cz
/
git
/
gitweb-caching.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'tr/rev-list-docs' into next
2008-08-18
Junio C H
a
man
o
Merge b
r
a
nch
't
r
/rev-list-docs' into next
commit
|
commitdiff
|
tree
2008-08-18
J
unio
C H
a
mano
M
e
rge branc
h
'
j
c/post-simplif
y
' (ea
r
ly
p
art) int
o
ne
x
t
commit
|
commitdiff
|
tree
2008-08-18
Junio
C Hamano
Me
r
ge branch 'sp
/
missi
n
g-th
i
n
-base
'
into next
commit
|
commitdiff
|
tree
2008-08-18
Junio C H
a
mano
Merge branch 'tr
/
filter-branch' into next
commit
|
commitdiff
|
tree
2008-08-18
Juni
o
C Hama
n
o
Merge b
r
anch 'js/chec
k
out-dwim-local' i
n
to next
commit
|
commitdiff
|
tree
2008-08-18
J
u
nio
C
Ha
m
ano
Merge branch 'bd
/
dif
f
-strbuf' into next
commit
|
commitdiff
|
tree
2008-08-18
Junio
C Hamano
Merge br
a
nch
'
am/cherry-pick
-
rerere
'
into next
commit
|
commitdiff
|
tree
2008-08-18
Ju
n
io C Hamano
M
erge branch 'jc
/
t
e
st-
d
eeper' in
t
o
n
ext
commit
|
commitdiff
|
tree
2008-08-18
Juni
o
C Hamano
Merge br
a
nch 'kh/diff-tree
'
i
nto next
commit
|
commitdiff
|
tree
2008-08-18
Junio C Ham
a
no
Merge branch
'
js/parallel-t
e
st'
i
nto next
commit
|
commitdiff
|
tree
2008-08-18
Ju
n
io C
H
amano
Merge branch 'jc/add
-
s
top-at-
s
ym
l
ink' into next
commit
|
commitdiff
|
tree
2008-08-18
Junio C Hamano
M
erg
e
branch 'dp/h
a
s
h
-literally'
i
nto nex
t
commit
|
commitdiff
|
tree
2008-08-18
Juni
o
C Ha
m
ano
Mer
g
e
branch 'mv
/
merge-custom' into
n
e
x
t
commit
|
commitdiff
|
tree
2008-08-18
J
u
n
io C Hamano
Merge branch
'
cc/
m
er
g
e
-bas
e
-many' int
o
nex
t
commit
|
commitdiff
|
tree
2008-08-18
Junio C Hamano
Merge branch 'rs/imap' into next
commit
|
commitdiff
|
tree
2008-08-18
Junio
C
Hamano
Me
r
ge b
r
anch
'jc/
a
dd-ad
d
remove' into
next
commit
|
commitdiff
|
tree
2008-08-18
Junio C Hamano
Mer
g
e branch 'jk/pager-swap' int
o
nex
t
commit
|
commitdiff
|
tree
2008-08-18
Junio
C
Hamano
Merge b
r
anc
h
'sg/merge-options' into
n
e
xt
commit
|
commitdiff
|
tree
2008-08-18
Junio C Ha
m
an
o
Merge b
r
anch 'ph/enable-
t
hreaded'
i
nto
n
ext
commit
|
commitdiff
|
tree
2008-08-17
Jun
i
o
C Hama
n
o
Start 1
.
6
.
1
cy
c
le
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-17
J
unio C H
a
mano
Start 1
.
6
.
0
.
X m
a
i
n
tenance ser
i
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-17
Ju
n
io
C Ha
m
an
o
GIT 1
.
6
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-17
Junio C Hamano
Merge
git-gui 0
.
11
.
0
commit
|
commitdiff
|
tree
2008-08-17
J
u
n
i
o C H
a
mano
Merge branch
'
a
k
/p4'
commit
|
commitdiff
|
tree
2008-08-17
Junio C Ha
m
ano
tests
:
us
e
$TEST_DI
R
ECTORY to refer to the t/ directory
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-17
Robert Blum
git-p4: chdir now properly set
s
PWD environme
n
t variable
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-17
Stephan Beyer
I
m
prove
e
rror output o
f
git-
r
e
b
ase
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-17
Miklos
V
a
jna
t93
0
0: replac
e
'!' with t
e
s
t
_m
u
st_fail
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-17
Junio C Haman
o
Merge
git://git
.
k
e
rnel
.
org/p
u
b/
s
c
m
/gitk/gitk
commit
|
commitdiff
|
tree
2008-08-16
Marcus
G
riep
Git
.
pm: Make File::Spe
c
a
nd File::
T
emp req
u
irem
e
nt
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-16
Miklos Vaj
n
a
Docu
m
entation: d
o
cument
t
he pager
.
* con
f
igurat
i
on setti
n
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-16
Stephan B
e
yer
git
-
s
tash:
im
p
rove syno
p
sis i
n
help and
m
an
u
al page
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-16
E
r
ic Bl
a
ke
M
ak
e
file: bu
i
l
d
ing git in c
y
gw
i
n 1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-16
Stephan
Be
y
er
g
i
t-
a
m: ignore --bi
n
a
ry o
p
t
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-16
Ma
r
cus Grie
p
bash-co
m
pl
e
ti
o
n: Add non-command git he
l
p files to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-15
Alex Riesen
Fix t3700 on filesystem
s
w
h
ich do not s
u
pp
o
rt ques
t
i
on
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-15
Anand K
u
mria
Utilise our n
e
w p4_read_pipe and
p4_write_pipe wrappers
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-15
Anand Kumria
Add p4 read_
p
ipe and
write_pipe wrappers
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-15
Lee Marlow
bash completion: Add '--merge' long option for 'git
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-15
L
ee Mar
l
ow
ba
s
h completion: A
d
d
c
ompletion for 'git mergetool'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-15
Mat
t
Mc
C
utchen
g
i
t for
m
at-pat
c
h docume
n
tation:
clari
f
y wh
a
t
--cover
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-15
Eric Ra
i
ble
bash completion: 'gi
t
ap
p
ly'
should use
'
f
i
x' not
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-14
Junio C
H
a
m
ano
re
v
i
s
i
o
n
--simplify-m
e
r
g
es: use
d
ecorati
o
n
ins
t
ead
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-14
Junio
C
Hamano
xdiff-interface: hide the whole "xdiff_emit_state"
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-14
G
ustaf
H
ende
b
y
Update
.
gitignore to ignore g
i
t-hel
p
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-14
Br
i
an Downing
Use
s
trbuf for struct xdiff_em
i
t_state
'
s rem
a
inder
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-14
Brian Downing
Make
xdi_di
f
f_outf inter
f
ace for r
u
n
ning xdiff
_
outf
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-14
Jun
i
o C Hamano
Merg
e
b
ranch 'maint'
commit
|
commitdiff
|
tree
2008-08-14
Brandon
C
asey
t5
3
0
4-prune: adjust
file mti
m
e based on sys
t
em time
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-14
Brandon Casey
test-parse
-
o
pt
i
ons: use appropriate cast in length
_
callback
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-14
Ke
v
in
Ballard
Fix
e
scaping
o
f glob specia
l
cha
r
acters
i
n pathspecs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-13
Thomas Ra
s
t
rebase
-i -p:
f
ix pare
n
t r
e
writi
n
g
commit
|
commitdiff
|
tree
2008-08-13
Thomas Rast
rebase -i -p: handl
e
index and workdir correctly
commit
|
commitdiff
|
tree
2008-08-13
Junio C Hama
n
o
GIT 1
.
6
.
0-rc3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-13
Ju
n
i
o C
Hamano
Merge
bra
n
ch 'main
t
'
commit
|
commitdiff
|
tree
2008-08-13
Jun
i
o
C Hamano
Do not talk ab
o
ut "dif
f
" in rev-list doc
u
mentation
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-13
Junio C H
a
mano
M
erge git://git
.
bo
g
omi
p
s
.
org/git-sv
n
commit
|
commitdiff
|
tree
2008-08-13
Thomas Ra
s
t
Documenta
t
io
n
: rev-list-options: mov
e
--simplify-m
e
rges
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-13
Ju
n
io C H
a
mano
Merge
branch 'jc/post-simplify' into tr/
r
ev-li
s
t-docs
commit
|
commitdiff
|
tree
2008-08-13
Thomas Rast
Documentation: rev-lis
t
-optio
n
s
: Rewrite simplifi
c
ation
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-13
T
h
o
m
as Rast
f
i
l
ter-branch:
u
se --simplify-merges
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-13
Junio C Ham
a
no
Merge branch
'j
c
/pos
t
-sim
p
lify' i
n
to t
r
/filter-
b
ranch
commit
|
commitdiff
|
tree
2008-08-13
Thomas
R
ast
filter-bra
n
ch: fix
r
ef rewriting with
-
-subdirect
o
ry
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-13
Thom
a
s Rast
filte
r
-
br
a
nch: Extend tes
t
to
s
h
ow rewr
i
ting bug
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-12
G
u
sta
f
Hend
e
by
Teach git diff about BibTeX hea
d
hunk patterns
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-12
Gustaf Hendeby
gitatt
r
ibutes: Docume
n
t
b
uilt i
n
hunk header pa
t
terns
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-12
Stephen R
.
van den
.
.
.
git-d
a
emon:
S
ys
V
needs the
s
ignal han
d
ler
r
ein
s
tated
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-12
Shawn O
.
Pearce
pack-objects: Allow missing base obj
e
cts when creating
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-12
J
unio C Hama
n
o
di
f
f --c
h
ec
k
: do
not unconditionally complain abo
u
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-12
Junio C Hamano
Merge bra
n
c
h 'ma
i
nt'
commit
|
commitdiff
|
tree
2008-08-12
Anand Kumria
P
ut in the two other configurati
o
n
elem
e
n
t
s f
o
und
in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-12
Anand Kumria
Put
some document
a
t
ion in
about t
h
e
p
a
r
amet
e
r
s that
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-12
Anand Ku
m
ria
Move git-p4
.
s
yn
c
F
romOrigin into a
c
onfigurat
i
on para
m
eters
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-12
A
nand Kumria
Consistently use 'g
i
t-p4' for
t
he
c
on
f
igura
t
ion entries
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-12
Anand Kumria
If the us
e
r has configured
var
i
ous param
e
te
r
s, u
s
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-12
A
nand Kumria
Switch
to u
s
in
g
'p4_build_cmd'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-12
Anand Kumria
I
f we are in v
e
rbos
e
mode, o
u
tput what we are about
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-12
Anand Ku
m
r
ia
Add a sing
l
e comman
d
that w
i
ll be used to construct
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-12
Anand
K
umria
Utilise the new 'p4_system' functi
o
n
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-12
Anand Kumria
H
av
e
a comma
n
d th
a
t spe
c
i
f
ically invokes '
p
4' (via
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-12
Anand K
u
m
r
ia
Utilise the new 'p4_read_pipe_lines' command
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-12
An
a
n
d
K
u
mria
Create
a specific version
of th
e
read_pi
p
e_lines command
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-12
Thomas Rast
Documentation:
re
v
-li
s
t-
o
p
tions: Fix a
t
ypo
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-12
Petr Baudis
A
d
just for the n
e
w way
of enabling the de
f
ault post
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-11
Francis Mo
r
eau
g
it-bisect: fix wrong usage of read(1)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-11
N
g
u
yễn Thái Ngọc Duy
F
i
x
t
ypo i
n
c
ommen
t
s of
longest_ancestor_length
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-11
Abhiji
t
M
enon
-
Sen
Make cherr
y
-pick us
e
r
e
rere for conflict resolution
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-11
J
o
hannes Schindelin
checko
u
t --track: m
a
k
e up a
s
ensible branch
n
am
e
if
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-11
Junio C Hamano
M
e
rge bra
n
c
h 'maint'
commit
|
commitdiff
|
tree
2008-08-11
Junio C Hamano
R
e
-fix r
e
v-list-o
p
t
i
ons documentation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-11
Karl
H
ass
e
lström
A
d
d test for diff-tree --stdi
n
with two tre
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-11
Karl Hasselström
Tea
c
h git diff-tr
e
e -
-
stdin to diff trees
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-11
Karl
H
a
s
selst
r
öm
diff-tree: No
t
e
that the commit I
D
is print
e
d with
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-11
Karl
Hasselstr
ö
m
Re
f
actoring: Split
up
d
iff_
t
ree_stdin
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-11
Ju
n
i
o
C
Hamano
M
e
rg
e
branch 'm
a
int'
commit
|
commitdiff
|
tree
2008-08-11
Iv
a
n
Stank
o
v
ic
Doc
u
ment
a
ti
o
n: fi
x
i
nvalid refer
e
nce to 'mybranch'
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-11
J
u
nio C Hamano
F
i
x deleting re
f
lo
g
entrie
s
f
r
om HEAD
r
e
flog
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-11
Pieter d
e
Bie
reflog
t
e
st: ad
d
more tests for 'reflog d
e
lete'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-11
Thomas Rast
Documentation: rev-list-options: Fix -g paragraph f
o
rma
t
ting
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-09
Junio C
Ha
m
ano
Update
draft RelNotes for 1
.
6
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next