repo.or.cz
/
git
/
gitbuild.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
Dan Hens
g
e
n
git-mer
g
e documentatio
n
:
more details ab
o
u
t
r
esolvin
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-23
Alex Riesen
Exte
n
d
"c
h
eckout
-
-track" DWIM t
o
support mo
r
e cas
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Jonathan del Str
o
ther
Re
v
ert "Convert outpu
t
m
e
ssage
s
i
n
merge-recursive
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Junio
C
Hamano
templates/Makefile: in
s
tal
l
is
u
nnecessary, just use
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
B
r
and
o
n Casey
remote
.
c: add a
f
unction for deleting a refs
p
ec array
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Jo
h
a
nnes Sixt
filter-bran
c
h: Grok sp
e
cial ch
a
r
a
cters in tag nam
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Johann
e
s
Schindelin
t
est-lib: do not rem
o
ve t
r
ash_directory
if
c
alled with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Paolo Bonzini
provide more erro
r
s
f
o
r the "merge into empty h
e
ad
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Shawn O
.
Pear
c
e
M
a
ke
reflog qu
e
r
y
'@{1219188
2
91}' act as '@
{
200
8
.
8
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Neil Roberts
c
o
n
fig
.
m
ak
.
in: Pass on
L
DFLAGS from
c
onfigure
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Juni
o
C Hamano
Merge
b
ranch
'm
a
in
t
'
commit
|
commitdiff
|
tree
2008-08-21
Brandon Case
y
c
o
mp
a
t/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
H
e
r
land
Teach
"git
di
f
f -
p
" HTML fu
n
cname patterns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Kirill S
m
elkov
T
each "
g
i
t
d
i
ff -
p
"
P
yth
o
n funcname
patt
e
rns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Eric Wong
git-svn
:
fix dcommit to
u
rls with embedd
e
d usernames
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Junio C Haman
o
Mer
g
e
branch 'ml/sub
m
o
dule-
f
or
e
ach
'
commit
|
commitdiff
|
tree
2008-08-21
J
u
nio C H
a
ma
n
o
Me
r
ge branch
'
p
m/l
o
g-exit-code
'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
Merge branch '
s
b/commit-tree
-
m
inileak'
commit
|
commitdiff
|
tree
2008-08-21
J
unio C Hamano
Merge
b
ranch 'pb/reflog-dwim'
commit
|
commitdiff
|
tree
2008-08-21
Junio C
Hamano
Merge branch 'jc/add-stop-at-symlin
k
'
commit
|
commitdiff
|
tree
2008-08-21
Junio
C Hamano
M
e
r
ge branch 'kh/diff-tr
e
e'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
Merge br
a
nch 'mg/coun
t
-objects'
commit
|
commitdiff
|
tree
2008-08-21
Junio C
H
a
mano
M
e
rge bra
n
c
h
'mz/push-v
e
r
bo
s
e'
commit
|
commitdiff
|
tree
2008-08-21
Junio
C
Hamano
Merge branch 'jc/i
n
d
e
x-exte
n
d
e
d-flags'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
M
e
rge
bran
c
h
'cc/mer
g
e-base-m
a
ny'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
Merge b
r
anch 'j
c
/test-deep
e
r'
commit
|
commitdiff
|
tree
2008-08-21
Ju
n
io C
H
am
a
n
o
Mer
g
e
b
ranch
'
js/p
a
rallel-test'
commit
|
commitdiff
|
tree
2008-08-21
Brandon Casey
rev
i
sion
.
h: make sh
o
w_early_output an extern
which
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Ju
n
i
o
C Ha
m
a
n
o
Upd
a
t
e
draft
r
el
e
ase notes fo
r
1
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Ju
n
io C Ha
m
ano
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2008-08-20
J
unio C
H
aman
o
Update draft rele
a
se notes f
o
r 1
.
6
.
0
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Tarmigan C
a
se
b
olt
Ad
d
hi
n
ts to
r
e
vert documentat
i
on about
o
ther
w
ays
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Johannes Sixt
Install templ
a
tes with th
e
user and group of the installing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hama
n
o
"git-merge": al
l
ow fast-forwarding in a sta
t
-dirt
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio C Haman
o
com
p
let
i
on: find
out s
u
pported merg
e
strate
g
ies correctly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Jeff
King
d
e
corat
e
: allow
c
o
nst objects to be d
e
corated
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Juni
o
C Hamano
for-each-ref
:
cop
e
with t
a
gs with incomplete
lines
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
diff --check: do not get confused by new blank lines
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio
C
H
amano
Me
r
ge branch 'bd/diff-strbuf'
commit
|
commitdiff
|
tree
2008-08-20
Ju
n
io C Hamano
Me
r
ge branch 'dp/hash
-
lite
r
a
l
l
y'
commit
|
commitdiff
|
tree
2008-08-20
J
u
nio
C
H
amano
M
erge bra
n
ch 'js/checkout-dwi
m
-local'
commit
|
commitdiff
|
tree
2008-08-20
Junio
C Hamano
Merge branch 'p
h
/en
a
bl
e
-t
h
readed'
commit
|
commitdiff
|
tree
2008-08-20
Junio
C Hamano
Merge
b
ranch 'jk/pager-swap'
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
M
e
rge branch 'r
s
/
i
map'
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
Merge
bra
n
ch 'js/min
g
w-stat'
commit
|
commitdiff
|
tree
2008-08-20
Jim Mey
e
ri
n
g
remot
e
.
c: remove useless if-befo
r
e-f
r
ee test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Jeff King
m
a
il
i
n
f
o: avo
i
d violating
s
trbuf assertion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Jim Meyerin
g
reword --full-index description
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Jim Meyering
S
ubm
i
ttin
g
Patches: fix a typo
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Jim
M
eyering
add boolean diff
.
suppress-blank-empty config option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Jim Meyering
git
fo
r
mat-patch:
avoid un
d
errun w
h
en form
a
t
.
head
e
rs
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-19
J
u
n
i
o C Hama
n
o
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2008-08-19
B
randon Ca
s
ey
t1
0
02-read-
t
ree-m
-
u-
2
wa
y
.
sh: use 'git dif
f
-U0'
r
ather
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-19
Marcus Griep
Update t/
.
git
i
gno
r
e
to
ignore
a
ll trash directo
r
ies
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-19
Joha
n
nes Sixt
Revert "Windows: Use
a cus
t
omi
z
ed struct stat that
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-19
Juni
o
C Hamano
compat: intr
o
du
c
e on_disk_bytes()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-19
Robert Schiele
adapt git-cvss
e
rve
r
manpage to dash-free s
y
ntax
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-19
Don
Zic
k
us
m
a
i
linfo: re-fix MIME multip
a
rt boundar
y
parsing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Mark Levedahl
g
it-submodule
-
Ad
d
'forea
c
h' subcommand
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Stephan Beyer
Fix commit_tree() buf
f
er leak
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Pe
t
e
r V
a
l
d
e
m
ar Mørch
T
e
ach
git log -
-
ex
i
t-code to retu
r
n an appr
o
pria
t
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Peter Valdemar
Mørch
Tea
c
h
git lo
g
-
-check to
return an approp
r
iat
e
e
x
it
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Pieter de B
i
e
b
u
i
ltin-ref
l
og: A
l
lo
w
reflog
e
x
p
i
r
e to name partial
r
ef
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Junio C Hamano
Sta
r
t
1
.
6
.
1 cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Junio C Hamano
Start 1
.
6
.
0
.
X
ma
i
ntenance series
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Junio C Hamano
GI
T
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
Junio
C Hamano
Merge bra
n
ch
'
ak
/
p4'
commit
|
commitdiff
|
tree
2008-08-17
Marcus Griep
count-obje
c
t
s
:
Add tota
l
pack siz
e
to
v
e
r
bos
e
out
p
ut
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Junio C Hamano
tes
t
s: use $TE
S
T_DIR
E
CTORY to refe
r
t
o
the t/ di
r
ectory
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Ma
r
ek
Z
awirski
Make push more verbose about illegal combin
a
t
ion of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
J
unio C
Ha
m
an
o
index: fut
u
r
e proof
f
or "
e
xtended"
i
ndex
e
ntr
i
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
R
obert Blum
gi
t
-p
4
: chd
i
r now properly
sets PWD envi
r
onment variable
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Stephan Beyer
Improve e
r
r
o
r outp
u
t of git-rebase
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Mik
l
os Vajna
t9300: repla
c
e '!' with tes
t
_m
u
s
t_fail
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Junio C Hamano
Merge git
:
//gi
t
.
ker
n
el
.
org/pub/scm
/
gi
t
k/gitk
commit
|
commitdiff
|
tree
2008-08-16
Marcus Griep
Git
.
pm
:
Mak
e
File
:
:Spec and File::Temp requirement
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-16
Miklos Vajna
D
o
cumentati
o
n
: document
t
he pager
.
* config
u
ra
t
io
n
se
t
t
ing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-16
Stephan Beyer
git-s
t
ash: i
m
prov
e
s
y
n
o
p
si
s
in help a
n
d manual
page
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-16
Eric Blake
Makefi
l
e: b
u
i
l
ding gi
t
in cygwin
1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-16
Step
h
an Beyer
g
it-am: ign
o
re --
b
i
na
r
y option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-16
Marcus Griep
ba
s
h-completion:
A
d
d
non-command git
help files t
o
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-15
A
lex
Riesen
Fix t3700 on
filesystems which
d
o not s
u
p
p
o
rt question
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-15
Anand Kumria
Utilise our new p4_read_p
i
pe
a
n
d p4_write_pipe
wrappers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-15
Ana
n
d
K
um
r
ia
A
d
d
p
4
read_pipe and write_pipe wrappers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-15
Lee Marl
o
w
ba
s
h completion: Add '--merge' long option for 'git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-15
Lee Marlow
ba
s
h completion: Add co
m
pletion
for
'
g
i
t m
e
rgetool'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-15
M
a
tt McCutchen
gi
t
format-patch documentat
i
on
:
cl
a
rify what
-
-cover
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-15
Er
i
c Ra
i
ble
ba
s
h
complet
i
o
n: 'git apply' should use 'fix' not
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-14
Ju
n
io
C
H
a
mano
xdiff-interface: h
i
de th
e
whole "xdiff_em
i
t_state"
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-14
Brian Downing
U
se
s
trbuf for
s
truct xdiff_emit_state's remainder
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-14
B
r
i
a
n
D
o
w
n
ing
M
ake xdi_diff_out
f
interface for runn
i
n
g xdiff_outf
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-14
Junio C Hamano
Merge branch 'maint
'
commit
|
commitdiff
|
tree
2008-08-14
Brand
o
n Casey
t5304-prun
e
: adjust fi
l
e mtime based
on system tim
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-14
Brandon Casey
te
s
t-pa
r
s
e
-options: use ap
p
r
o
pri
a
te cast in l
e
ngth_callb
a
ck
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-14
Kevin Ballar
d
F
ix escapi
n
g of glob speci
a
l
characters in
p
ath
s
pecs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-13
Thomas Rast
rebase -i
-
p: fix parent rewriting
commit
|
commitdiff
|
tree
2008-08-13
Thomas Rast
reb
a
se -i -p:
h
an
d
le ind
e
x and workd
i
r 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
J
u
nio
C
H
ama
n
o
Merge branc
h
'
maint'
commit
|
commitdiff
|
tree
next