repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
git-merge documentation: more details about resolving conflicts
2008-08-23
Da
n
Hensgen
git-merge d
o
c
umentation: more d
e
t
a
ils about
r
e
solving
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-23
A
le
x
Riesen
Extend "checkout --track" DWIM to suppor
t
more
c
ases
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
J
o
nathan del Strothe
r
Reve
r
t
"Conver
t
output messages
i
n merge-
r
ecurs
i
ve
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
Juni
o
C
Hamano
templa
t
es/Makefile:
i
nstall is unnecessary, just use
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
Bran
d
on Cas
e
y
rem
o
t
e
.
c: add a f
u
nction
f
or deleting
a
r
e
fspec array
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
Johann
e
s Sixt
filte
r
-bra
n
ch: Grok sp
e
cial characters in tag names
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
Johan
n
es Schindelin
test-lib: do not remove trash
_
directory
i
f calle
d
with
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
Paolo Bonz
i
ni
p
r
o
v
ide
more er
r
ors for t
h
e "merge into empty head
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
S
ha
w
n O
.
Pear
c
e
Make reflog query '@{1219188291}'
act as '
@
{2008
.
8
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
Nei
l
R
o
berts
config
.
mak
.
i
n: Pass on
L
DFLAGS from c
o
nfigure
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-21
Junio
C
H
a
m
ano
Merg
e
b
r
a
nch
'm
a
int'
commit
|
commitdiff
|
tree
2008-08-21
Brando
n
Ca
s
e
y
compat/
s
n
p
rintf
.
c: handle snprintf's that always return
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-21
Jo
h
an Herlan
d
Teach
"
git
d
iff -p" HTML
funcnam
e
patterns
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-21
Kirill Sme
l
kov
T
e
ach "git
dif
f
-p" Python
funcname p
a
tterns
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-21
E
r
ic
Wong
git-svn: fix dcommit to urls with embedded user
n
ames
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
M
e
rge
b
ranch 'ml/submodul
e
-
f
oreach'
commit
|
commitdiff
|
tree
2008-08-21
Junio
C Hamano
Merge bran
c
h 'pm/log-exi
t
-code'
commit
|
commitdiff
|
tree
2008-08-21
Junio C
H
amano
Merge branch
'
sb
/
commit-t
r
ee-m
i
n
i
l
eak'
commit
|
commitdiff
|
tree
2008-08-21
Juni
o
C
Hama
n
o
Merge br
a
nch 'pb/reflog-dw
i
m'
commit
|
commitdiff
|
tree
2008-08-21
Jun
i
o C Hamano
Merge branch 'jc/a
d
d
-
stop-at-syml
i
nk'
commit
|
commitdiff
|
tree
2008-08-21
Juni
o
C
Hama
n
o
M
erge
branch 'kh/
d
iff-tree'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Ha
m
ano
Merge branch 'mg/count-objects'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Haman
o
Merg
e
bra
n
c
h 'mz
/
push-
v
erbose'
commit
|
commitdiff
|
tree
2008-08-21
Junio C H
a
m
ano
Merge branch 'jc/in
d
ex-e
x
ten
d
ed-flags'
commit
|
commitdiff
|
tree
2008-08-21
J
unio C Ham
a
no
M
er
g
e
branch '
c
c
/
merge-bas
e
-
ma
n
y'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
Merg
e
bran
c
h
'jc/test
-
d
e
e
p
er'
commit
|
commitdiff
|
tree
2008-08-21
Junio C
H
amano
M
e
rge branch 'j
s
/para
l
l
e
l-test'
commit
|
commitdiff
|
tree
2008-08-21
Brandon Casey
revision
.
h: make show_early_output
an extern whi
c
h
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
Jun
i
o C Hama
n
o
Updat
e
d
raft release n
o
tes for 1
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
Juni
o
C
H
a
mano
M
erge branch 'm
a
i
nt'
commit
|
commitdiff
|
tree
2008-08-20
J
unio C Hamano
Update d
r
a
ft
r
e
lease
notes fo
r
1
.
6
.
0
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
Tar
m
igan Casebolt
A
d
d h
i
n
t
s
t
o
revert documentation a
b
out othe
r
w
a
y
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
Johannes Sixt
Install t
e
mplates
w
ith
t
h
e us
e
r a
n
d
gro
u
p of the insta
l
ling
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
Juni
o
C Ha
m
an
o
"git-merge": allow fast-forwardi
n
g in
a stat-dirty
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
J
u
n
io
C
Hamano
completion: find ou
t
suppo
r
ted
merge stra
t
egies c
o
rrectly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
Jeff King
decorat
e
:
allow const o
b
j
e
c
t
s
t
o
be
d
e
cor
a
ted
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
for-e
a
ch-ref: cope with tags with incomplete
lin
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
diff --ch
e
ck: do not ge
t
c
onfused
b
y new
b
l
a
n
k lines
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
Junio C H
a
mano
M
e
r
g
e
branch 'bd/dif
f
-strbuf'
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
Merge
branch 'dp/ha
s
h-l
i
terally'
commit
|
commitdiff
|
tree
2008-08-20
Junio C H
a
mano
Merge branc
h
'js/che
c
kout-dwim-local'
commit
|
commitdiff
|
tree
2008-08-20
Jun
i
o C
H
amano
Merge
branch 'ph/enable-t
h
r
eaded'
commit
|
commitdiff
|
tree
2008-08-20
J
un
i
o
C Ham
a
no
Merge bran
c
h 'j
k
/pa
g
er-sw
a
p'
commit
|
commitdiff
|
tree
2008-08-20
Junio C Ha
m
ano
Merge branch 'rs/im
a
p'
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
Merge branch 'js/mingw
-
s
tat'
commit
|
commitdiff
|
tree
2008-08-20
Ji
m
M
eyering
remote
.
c:
remove us
e
less if-before-free
t
est
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
Jeff
King
mailinfo: avoid viol
a
ting str
b
uf ass
e
rt
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
Jim Meyering
r
e
word --ful
l
-index
d
esc
r
iption
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
Jim Meyering
SubmittingPatc
h
es:
f
i
x a typo
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
Jim Meyering
a
d
d b
o
o
l
ean diff
.
su
p
p
r
ess-b
l
ank-empty co
n
f
ig option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
Jim Me
y
ering
git f
o
rmat-patch: avoid
underrun when f
o
rma
t
.
h
e
aders
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-19
Junio
C H
a
mano
Merge branch
'
mai
n
t'
commit
|
commitdiff
|
tree
2008-08-19
Brandon Casey
t1002-
r
ead-t
r
e
e
-
m-u-2way
.
s
h
: use 'git
diff -U
0
' rather
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-19
Marcus Griep
U
pdate t/
.
git
i
gnore to ignore
a
ll
trash di
r
ectories
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-19
Johannes Sixt
Re
v
ert "Windows
:
Us
e
a custom
i
zed str
u
c
t stat that
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-19
Juni
o
C Ha
m
ano
compat: introduce on_d
i
sk_by
t
e
s()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-19
R
obert Schiele
a
dapt g
i
t
-cvsser
v
er manpag
e
t
o
d
a
sh-free syntax
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-19
Don Zi
c
k
us
mailinf
o
:
re-fix MIME multipart boundary
p
arsing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-17
Mark Levedahl
git-submodule - Add
'
f
o
r
e
ach' s
u
bc
o
mman
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-17
Stepha
n
Beyer
Fix commit_tree
(
) buffer leak
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-17
Peter Valdemar Mørc
h
T
e
ach
git log --exit-cod
e
to
r
eturn an appro
p
riate
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-17
Peter Valdemar Mørch
Teach git l
o
g --c
h
eck to return an
appropria
t
e
e
x
i
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-17
Pieter
d
e
B
ie
bui
l
tin-
r
e
flo
g
: All
o
w
reflog expir
e
to name part
i
al ref
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-17
Junio C Ham
a
no
Start 1
.
6
.
1 cycle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-17
Jun
i
o C H
a
mano
Start 1
.
6
.
0
.
X
m
a
intenance serie
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-17
Ju
n
io C Hamano
GIT 1
.
6
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-17
J
un
i
o
C
Hamano
Merg
e
gi
t
-gui 0
.
11
.
0
commit
|
commitdiff
|
tree
2008-08-17
Junio C Hamano
Me
r
ge b
r
anch 'ak/p4'
commit
|
commitdiff
|
tree
2008-08-17
Marcus Grie
p
count-obj
e
cts: Add total pac
k
size to v
e
rbose output
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-17
Junio C Hamano
tests: use $TEST_DIRECTORY to refer to the t/
dir
e
ctor
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-17
Ma
r
ek
Zawi
r
s
k
i
Make push mo
r
e v
e
rbose abo
u
t
illega
l
c
ombin
a
tion
o
f
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-17
Junio
C
Ha
m
ano
index: future proof
f
o
r
"
e
x
t
ended" i
n
d
ex entr
i
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-17
Robe
r
t Blum
git-p
4
: c
h
dir now pr
o
perly sets
PWD e
n
viro
n
me
n
t
var
i
able
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-17
Ste
p
han Beyer
Improve error outp
u
t of git-reba
s
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-17
M
i
k
lo
s
V
ajna
t93
0
0: replace
'!' with test_m
u
st_
f
ail
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-17
Junio C Ha
m
ano
M
e
rge
g
it://git
.
kernel
.
org/p
u
b
/s
c
m/
g
itk/gitk
commit
|
commitdiff
|
tree
2008-08-16
Marcus Grie
p
Git
.
pm: Mak
e
File::
S
pec
and File::Temp requ
i
rement
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-16
Miklos Vajna
Docum
e
ntation: docume
n
t
the pager
.
* configuration se
t
ting
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-16
Stephan
B
ey
e
r
g
it-stash:
i
mprove synopsis in help a
n
d
manual page
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-16
Eric Blake
M
ake
f
ile: b
u
ilding g
i
t
i
n cygwin 1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-16
S
t
ephan Beyer
git-
a
m
: ig
n
ore --b
i
na
r
y option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-16
M
a
rcus Griep
ba
s
h-
c
ompletion: Add
non-
c
ommand git
help files to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-15
Alex Riesen
F
ix t
3
700 on
filesystem
s
w
h
ich do not support question
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-15
A
n
and Kum
r
ia
Utili
s
e our
new p4_r
e
ad_pipe
a
nd p4_write_pipe wr
a
p
p
ers
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-15
Anand K
u
mria
A
d
d p4 read
_
pip
e
and write_pipe wr
a
ppers
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-15
L
e
e Marlo
w
bash
c
o
mpletion: Add '
-
-merge' long option fo
r
'git
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-15
Lee Marlow
bas
h
completion: Add
c
ompletion for 'git m
e
rgetool'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-15
Ma
t
t McCutchen
g
i
t format-patch
d
ocume
n
tat
i
on: clarify what --co
v
er
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-15
Eric Raible
bash c
o
mpletion:
'
git
a
pply' should use 'fi
x
' not
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-14
Junio C Hamano
xdiff-interface: hide t
h
e w
h
ole "xdif
f
_
e
mit_s
t
ate"
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-14
Brian Down
i
ng
Us
e
strbuf
f
or struct xdiff_emit_
s
tate's remainder
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-14
Brian Downin
g
Make x
d
i_dif
f
_outf interfa
c
e for running xd
i
ff_o
u
tf
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-14
Junio C Hamano
Merge
bra
n
c
h
'maint'
commit
|
commitdiff
|
tree
2008-08-14
Brandon Ca
s
ey
t530
4
-prune: adjust file mtim
e
based on sys
t
em time
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-14
B
rand
o
n Cas
e
y
test-parse
-
o
ptions: u
s
e appr
o
priate cas
t
in length_callback
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-14
Kevin Ballard
Fix e
s
c
aping of glob spe
c
ia
l
chara
c
t
ers
i
n pathsp
e
cs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-13
Thomas Rast
rebase -i
-p: fix pare
n
t re
w
riting
commit
|
commitdiff
|
tree
2008-08-13
Thomas Rast
r
e
ba
s
e -i -p
:
hand
l
e
index an
d
workdir correctly
commit
|
commitdiff
|
tree
2008-08-13
Junio
C
Ham
a
no
GIT 1
.
6
.
0-rc3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-13
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
next