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
Hamano
Merge bran
c
h 'tr/rev-l
i
st-docs' into next
commit
|
commitdiff
|
tree
2008-08-18
Junio
C
Hamano
Merge branch 'jc/post-simplify'
(
ea
r
ly pa
r
t
)
into next
commit
|
commitdiff
|
tree
2008-08-18
Jun
i
o C Ham
a
n
o
Merge branch 's
p
/
missi
n
g-thin-base
'
int
o
next
commit
|
commitdiff
|
tree
2008-08-18
Jun
i
o C Hamano
Me
r
ge b
r
anch 'tr/filter-branch' into next
commit
|
commitdiff
|
tree
2008-08-18
Junio C Ha
m
a
n
o
Merge branch 'js/checkout-
d
w
im-
l
o
c
al' into
next
commit
|
commitdiff
|
tree
2008-08-18
Junio
C
H
amano
Me
r
g
e
branch '
b
d/diff-s
t
rbuf' into next
commit
|
commitdiff
|
tree
2008-08-18
Junio C Ham
a
no
Merge b
r
anch 'am/cherry-pi
c
k-rerere' i
n
to next
commit
|
commitdiff
|
tree
2008-08-18
Junio C Hamano
Merge
b
ranch 'jc/
t
e
s
t-deeper' into
n
ext
commit
|
commitdiff
|
tree
2008-08-18
Ju
n
io C Hama
n
o
Merg
e
branch 'kh/diff-tr
e
e' in
t
o
n
ext
commit
|
commitdiff
|
tree
2008-08-18
Junio C Ha
m
ano
Merg
e
branch '
j
s/
p
arallel-test' into next
commit
|
commitdiff
|
tree
2008-08-18
Junio C
H
amano
Merge b
r
anch 'jc/
a
dd
-
stop-at-symlink'
into next
commit
|
commitdiff
|
tree
2008-08-18
Junio C Hamano
Merge
b
ranch 'dp/
h
ash-literally'
i
n
to next
commit
|
commitdiff
|
tree
2008-08-18
Junio C Hamano
Merg
e
branch
'
m
v/merge-cu
s
tom
'
into next
commit
|
commitdiff
|
tree
2008-08-18
Ju
n
io C Hamano
Merge
branch 'c
c
/merge-b
a
s
e
-many' into next
commit
|
commitdiff
|
tree
2008-08-18
Junio C Hama
n
o
Me
r
ge branc
h
'rs/imap' into next
commit
|
commitdiff
|
tree
2008-08-18
Junio
C Hamano
Merge br
a
nch 'jc/add-addremove' in
t
o next
commit
|
commitdiff
|
tree
2008-08-18
Junio C Hamano
M
erge
branch 'jk/pager-
s
w
ap' in
t
o next
commit
|
commitdiff
|
tree
2008-08-18
Juni
o
C Hamano
Merg
e
branch 'sg/merge-options' into next
commit
|
commitdiff
|
tree
2008-08-18
J
u
nio C
H
a
mano
Mer
g
e
branch 'ph/en
a
ble-threade
d
' i
n
to nex
t
commit
|
commitdiff
|
tree
2008-08-17
Junio C Hamano
St
a
rt 1
.
6
.
1 c
y
c
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Junio C
Hamano
Sta
r
t 1
.
6
.
0
.
X maintenance series
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Junio C Ham
a
no
GIT 1
.
6
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Junio C Ha
m
ano
Merg
e
git
-
gui 0
.
1
1
.
0
commit
|
commitdiff
|
tree
2008-08-17
J
u
nio C Hama
n
o
Me
r
ge br
a
n
c
h
'ak/p4
'
commit
|
commitdiff
|
tree
2008-08-17
Juni
o
C
Hamano
test
s
: use $
T
EST_DIR
E
CT
O
RY to r
e
fer to the t/
d
ir
e
ctory
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Rob
e
rt Blum
g
i
t
-
p4: chdir now properly sets P
W
D env
i
r
o
n
ment vari
a
b
l
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Stephan Beyer
Improve error
output of git-reb
a
se
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Miklo
s
V
a
jna
t93
0
0: replace '
!
' wi
t
h test_must_fail
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Jun
i
o C H
a
mano
Me
r
ge g
i
t://
g
it
.
kernel
.
org/pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2008-08-16
Ma
r
cus Gr
i
ep
Git
.
pm:
Ma
k
e
File::Spec and File::Temp require
m
ent
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-16
Miklos Vajna
Do
c
ume
n
tati
o
n: document
t
he pager
.
* configu
r
a
t
ion setting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-16
Steph
a
n Beyer
git-stash:
i
m
p
rove synop
s
is
i
n help and manual page
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-16
Eric Bl
a
k
e
Ma
k
efi
l
e: building git in cygwin
1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-16
St
e
phan Beyer
git-am
:
ignore --bi
n
ary op
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-16
Marc
u
s Griep
bash
-
compl
e
tion: Add non
-
c
o
mmand git help
f
iles to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-15
A
l
e
x
Riesen
Fix t370
0
on fi
l
esystems which do
not
supp
o
r
t
question
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-15
Anand Ku
m
ria
Utilise our
new 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
r
ead_pipe
a
n
d
w
rite_pipe wrappers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-15
Lee
M
arlo
w
bash comp
l
etion: Add '
-
-
mer
g
e' l
o
ng option for 'git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-15
Lee Marlow
b
ash com
p
letion: Add com
p
letion f
o
r 'git me
r
getool'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-15
Matt M
c
Cut
c
hen
git
f
ormat-patch doc
u
menta
t
io
n
: clarify what --cover
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-15
Eric Rai
b
le
bash completion: 'git apply' should use
'fix' not
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-14
Jun
i
o C Hama
n
o
revis
i
on --
s
impl
i
fy-merges:
use decoratio
n
instead
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-14
Junio C H
a
mano
xdiff-interf
a
ce: hide
t
h
e
w
hole "xdiff_emit_state"
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-14
G
u
st
a
f Hendeby
Update
.
gitig
n
ore to ignore
g
it-help
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-14
Brian Downing
U
se
str
b
u
f
for
struct xdiff_emit_state's remaind
e
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-14
Br
i
an Downin
g
Make xdi_diff_outf
i
nter
f
ace for running xdiff_out
f
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-14
Ju
n
i
o
C Hamano
Me
r
ge
b
r
anch
'
m
a
i
n
t'
commit
|
commitdiff
|
tree
2008-08-14
Brando
n
Cas
e
y
t5304-
p
r
une: adj
u
s
t
f
i
l
e mtime b
a
sed on system time
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-14
Brandon C
a
sey
test-parse-opt
i
ons:
use app
r
opriate cas
t
i
n
l
engt
h
_ca
l
l
back
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-14
Kevin Ball
a
rd
Fix esca
p
i
n
g of glob spe
c
ial cha
r
ac
t
ers i
n
pat
h
specs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-13
Tho
m
as Rast
r
ebas
e
-i -p:
f
ix pa
r
ent
r
ewriting
commit
|
commitdiff
|
tree
2008-08-13
Thoma
s
Rast
re
b
as
e
-i -p
:
handle index and workdir
c
o
rr
e
ctly
commit
|
commitdiff
|
tree
2008-08-13
Ju
n
i
o
C Ha
m
ano
GIT 1
.
6
.
0-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-13
J
unio C Ham
a
no
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2008-08-13
J
u
nio C Hamano
Do not
talk about "d
i
ff" in r
e
v-li
s
t documentatio
n
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-13
Junio C
H
amano
Merge
git://git
.
b
o
gom
i
ps
.
org/git-svn
commit
|
commitdiff
|
tree
2008-08-13
T
h
omas Rast
Doc
u
mentation: rev-list-options: move --simplify-merges
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-13
J
unio C H
a
mano
M
er
g
e branch 'jc/post-simplify' into t
r
/r
e
v-list-docs
commit
|
commitdiff
|
tree
2008-08-13
Th
o
m
a
s Rast
Docu
m
entation: rev-l
i
st-options:
Rewri
t
e simplification
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-13
T
homas R
a
st
fil
t
e
r-b
r
anc
h
: use --simplify-merges
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-13
Junio C Haman
o
Merge
b
r
anch 'jc/po
s
t-simplify' int
o
tr/filter
-
bra
n
ch
commit
|
commitdiff
|
tree
2008-08-13
Thoma
s
R
a
st
filter-branch:
f
i
x
r
ef
r
ewri
t
i
n
g with --sub
d
irectory
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-13
Th
o
mas R
a
st
filter-b
r
anch: Extend tes
t
to show rew
r
iting bug
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-12
Gustaf H
e
ndeby
Teach git di
f
f ab
o
ut BibTeX head hu
n
k pa
t
terns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-12
G
u
sta
f
H
e
ndeby
gitattri
b
u
te
s
: Do
c
ument built in h
u
nk header
p
a
ttern
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-12
S
t
e
phen R
.
v
a
n den
.
.
.
git-daemo
n
: SysV need
s
the sign
a
l handle
r
reinstat
e
d
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-12
Shawn O
.
Pearce
pack-objects
:
Allow missing base
o
bje
c
ts wh
e
n creating
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-12
Junio C Hamano
diff --
c
heck: do not unconditionally compl
a
in about
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-12
J
u
nio C Hamano
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2008-08-12
Anand Kumria
Put in the two other
configuration el
e
me
n
ts fou
n
d in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-12
Anand Kum
r
ia
Put some
d
o
c
u
m
entation i
n
about the
p
arameter
s
that
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-12
Anand Ku
m
ria
Move git-p4
.
syncFromOrigin into
a
c
onfiguration pa
r
ameters
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-12
Anand Kumria
Consiste
n
tly use 'git-p4' for the c
o
nfi
g
ura
t
ion
e
n
tries
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-12
Anand Kumria
If the
u
ser h
a
s
con
f
igured various
paramete
r
s, use
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-12
Anand Kumria
Swi
t
ch to
using 'p4_bu
i
ld_cmd
'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-12
Anand Kumria
I
f we ar
e
in verbose mo
d
e, ou
t
put wh
a
t
we are abo
u
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-12
Anand K
u
m
r
ia
Add a si
n
gle command that will be used to construct
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-12
Anand Kumria
Utilise the new
'p
4
_system'
fu
n
c
tion
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-12
Anand
K
u
mria
Have a c
o
mmand that specifically invokes 'p4' (via
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-12
Anand
Kumria
Utilise t
h
e
n
ew 'p
4
_
read_pipe_line
s
'
com
m
a
n
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-12
Anand Kumria
C
reate
a
sp
e
c
i
fic version of
the read_p
i
p
e
_lines comma
n
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-12
Thomas
R
ast
Documentation: rev-list-
o
p
t
i
o
ns: Fix a typo
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-12
Petr
B
a
udis
Adju
s
t
for the new way of enab
l
ing the default post
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-11
F
r
anci
s
Mor
e
au
git-b
i
sect:
fix wrong us
a
g
e
of read(1)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-11
Nguyễn Thái Ngọc
D
uy
Fix typ
o
in co
m
ments of longest_ancestor
_
length()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-11
Abhi
j
it Men
o
n-Se
n
M
a
ke cherry
-
p
ick use re
r
ere for conflict reso
l
ution
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-11
Johannes
S
c
hinde
l
in
checkout --
t
rac
k
: make up a sensible branch nam
e
i
f
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-11
Junio C Hamano
Merg
e
b
r
anch 'maint'
commit
|
commitdiff
|
tree
2008-08-11
Junio C Hamano
R
e-fix r
e
v-list-options documentati
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-11
Karl Hass
e
lström
Add test f
o
r
d
iff-tr
e
e --stdin with two trees
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-11
Karl Hassels
t
röm
Teach g
i
t diff-
t
ree --stdin
t
o
dif
f
tre
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-11
K
a
rl Hasselstr
ö
m
d
i
f
f-tree: Note that
th
e
commit ID i
s
pr
i
nt
e
d
w
ith
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-11
Karl Ha
s
selström
Refactoring: Spli
t
up diff_tree_stdin
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-11
J
u
n
i
o
C
Ham
a
no
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-08-11
Ivan S
t
anko
v
ic
Do
c
ument
a
tion: fix
i
n
v
alid reference to 'm
y
bra
n
ch'
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-11
Junio C Hamano
Fix de
l
eti
n
g r
e
flog entri
e
s from HEAD reflog
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-11
Pieter de Bie
reflog
test: add more tests f
o
r 'reflog de
l
ete'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-11
Thom
a
s Rast
D
o
cumentat
i
on:
r
ev-
l
ist-option
s
: Fix
-g parag
r
a
ph formattin
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-09
Junio C
H
a
man
o
Upda
t
e
d
raft RelNot
e
s for
1
.
6
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next