1 Version v1.7.4.1; changes since v1.7.2.3:
2 -----------------------------------------
5 Don't pass "--xhtml" to hightlight in gitweb.perl script.
8 contrib/hooks/post-receive-email: fix return values from prep_for_email
10 Alejandro R. Sedeño (2):
11 gitweb: move highlight config out of guess_file_syntax()
12 Add --force to git-send-email documentation
15 status: show branchname with a configurable color
18 Add a for_each_string_list_item macro
19 Convert the users of for_each_string_list to for_each_string_list_item macro
21 Alexander Gladysh (1):
22 Add a rename + D/F conflict testcase
24 Alexander Sulfrian (2):
25 daemon: add helper function named_sock_setup
26 daemon: allow more than one host address given via --listen
28 Alexandre Erwin Ittner (1):
29 gitk: Add Brazilian Portuguese (pt-BR) translation
32 userdiff: match Pascal class methods
35 gitweb: Don't die_error in git_tag after already printing headers
36 apply: Recognize epoch timestamps with : in the timezone
37 describe: Use for_each_rawref
38 describe: Do not use a flex array in struct commit_name
39 describe: Store commit_names in a hash table by commit SHA1
40 describe: Delay looking up commits until searching for an inexact match
41 Mark gitk script executable
43 Andreas Gruenbacher (1):
44 Clarify and extend the "git diff" format documentation
47 submodule sync: Update "submodule.<name>.url" for empty directories
50 Fix handling of git-p4 on deleted files
53 Add a new option 'core.askpass'.
56 t/t9001-send-email.sh: fix stderr redirection in 'Invalid In-Reply-To'
57 git-send-email.perl: make initial In-Reply-To apply only to first email
58 t/t9001-send-email.sh: fix '&&' chain in some tests
61 Documentation: update-index: -z applies also to --index-info
64 Correctly report corrupted objects
67 git-rebase--interactive.sh: rework skip_unnecessary_picks
68 git-rebase--interactive.sh: use printf instead of echo to print commit message
69 t/t5510: demonstrate failure to fetch when current branch has merge ref
70 builtin/fetch.c: ignore merge config when not fetching from branch's remote
71 t/t7008: workaround broken handling of \000 by printf on IRIX
72 Makefile: use compat regex on IRIX 6.5
73 builtin/fetch.c: comment that branch->remote_name is usable when has_merge
74 t/t5510-fetch.sh: improve testing with explicit URL and merge spec
75 diff.c: call regfree to free memory allocated by regcomp when necessary
76 xdiff-interface.c: always trim trailing space from xfuncname matches
77 t/t4018: test whether the word_regex patterns compile
78 t/t4018: avoid two unnecessary sub-shell invocations
79 userdiff.c: add builtin fortran regex patterns
80 t/t7300: workaround ancient touch by rearranging arguments
81 t/t3903-stash: improve testing of git-stash show
82 builtin/revert.c: don't dereference a NULL pointer
83 wt-status.c: don't leak directory entries when processing untracked,ignored
84 git-send-email.perl: ensure $domain is defined before using it
85 diffcore-pickaxe.c: remove unnecessary curly braces
86 diffcore-pickaxe.c: a void function shouldn't try to return something
87 test-lib.sh/test_decode_color(): use octal not hex in awk script
88 Makefile: add NO_FNMATCH_CASEFOLD to IRIX sections
89 t9001: use older Getopt::Long boolean prefix '--no' rather than '--no-'
90 trace.c: ensure NULL is not passed to printf
91 t0001,t1510,t3301: use sane_unset which always returns with status 0
92 t3032: limit sed branch labels to 8 characters
95 t7610: cd inside subshell instead of around
96 t7606: Avoid using head as a file name
97 t7003: Use test_commit instead of custom function
98 git-stash: fix flag parsing
99 t/gitweb-lib: Don't pass constant to decode_utf8
100 t6022: Use -eq not = to test output of wc -l
103 mergetool: Remove explicit references to /dev/tty
106 git-rebase--interactive.sh: replace cut with ${v%% *}
109 clone: fixup recurse_submodules option
111 Christian Couder (12):
112 revert: report success when using option --strategy
113 revert: refactor commit code into a new run_git_commit() function
114 revert: don't print "Finished one cherry-pick." if commit failed
115 revert: improve success message by adding abbreviated commit sha1
116 t3508: add check_head_differs_from() helper function and use it
117 revert: fix off by one read when searching the end of a commit subject
118 revert: refactor code to find commit subject in find_commit_subject()
119 revert: rename variables related to subject in get_message()
120 bisect: use find_commit_subject() instead of custom code
121 merge-recursive: use find_commit_subject() instead of custom code
122 blame: use find_commit_subject() instead of custom code
123 t6050 (replace): fix bogus "fetch branch with replacement" test
125 Christoph Mallon (1):
126 diff --check: correct line numbers of new blank lines at EOF
128 Christopher Wilson (1):
129 Enable highlight executable path as a configuration option
131 Clemens Buchacher (16):
132 hash binary sha1 into patch id
133 add rebase patch id tests
134 do not search functions for patch ID
135 t7607: use test-lib functions and check MERGE_HEAD
136 t7607: add leading-path tests
137 add function check_ok_to_remove()
138 lstat_cache: optionally return match_len
139 do not overwrite files in leading path
140 do not overwrite untracked during merge from unborn branch
141 use persistent memory for rejected paths
142 t7607: use test-lib functions and check MERGE_HEAD
143 t7607: add leading-path tests
144 add function check_ok_to_remove()
145 lstat_cache: optionally return match_len
146 do not overwrite files in leading path
147 use persistent memory for rejected paths
150 documentation: git-config minor cleanups
153 bundle: detect if bundle file cannot be created
154 filter-branch: retire --remap-to-ancestor
157 mergetool-lib: combine vimdiff and gvimdiff run blocks
158 mergetool-lib: add a three-way diff view for vim/gvim
159 mergetool-lib: make the three-way diff the default for vim/gvim
161 Daniel Knittl-Frank (1):
162 Improvements to `git checkout -h`
165 mergetool: Skip autoresolved paths
168 Add memory pool library
169 Add string-specific memory pool
170 Add stream helper library
171 Infrastructure to write revisions in fast-export format
173 fast-import: Allow filemodify to set the root
174 fast-import: insert new object entries at start of hash bucket
175 fast-import: let importers retrieve blobs
178 git svn: fix dcommit to work with touched files
179 git-svn: fix regex to remove "tail" from svn tags
180 git-svn: fix fetch with deleted tag
183 git-blame.el: Add (require 'format-spec)
186 merge-recursive: porcelain messages for checkout
187 t7609: test merge and checkout error messages
189 Diego Elio Pettenò (1):
190 imap-send: link against libcrypto for HMAC and others
193 git svn: add an option to recode pathnames
196 Add additional testcases for D/F conflicts
197 merge-recursive: Fix D/F conflicts
198 merge_recursive: Fix renames across paths below D/F conflicts
199 fast-export: Fix output order of D/F changes
200 fast-import: Improve robustness when D->F changes provided in wrong order
201 fast-export: Fix dropping of files with --import-marks and path limiting
202 fast-export: Add a --full-tree option
203 upload-pack: Improve error message when bad ref requested
204 Mark tests that use symlinks as needing SYMLINKS prerequisite
205 merge-recursive: Fix typo
206 t6031: Add a testcase covering multiple renames across a D/F conflict
207 merge-recursive: Fix multiple file rename across D/F conflict
208 merge-recursive: Avoid excessive output for and reprocessing of renames
209 Document pre-condition for tree_entry_interesting
210 tree-walk: Correct bitrotted comment about tree_entry()
211 tree_entry_interesting(): Make return value more specific
212 diff_tree(): Skip skip_uninteresting() when all remaining paths interesting
213 cache_tree_free: Fix small memory leak
214 revert: Fix trivial comment style issue
215 t3509: Add rename + D/F conflict testcase that recursive strategy fails
216 merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir
217 t6032: Add a test checking for excessive output from merge
218 t6022: Add test combinations of {content conflict?, D/F conflict remains?}
219 t6022: Add tests for reversing order of merges when D/F conflicts present
220 t6022: Add tests with both rename source & dest involved in D/F conflicts
221 t6022: Add paired rename+D/F conflict: (two/file, one/file) -> (one, two)
222 t6022: Add tests for rename/rename combined with D/F conflicts
223 t6020: Modernize style a bit
224 t6020: Add a testcase for modify/delete + directory/file conflict
225 t6036: Test index and worktree state, not just that merge fails
226 t6036: Add a second testcase similar to the first but with content changes
227 t6036: Add testcase for undetected conflict
228 merge-recursive: Small code clarification -- variable name and comments
229 merge-recursive: Rename conflict_rename_rename*() for clarity
230 merge-recursive: Nuke rename/directory conflict detection
231 merge-recursive: Move rename/delete handling into dedicated function
232 merge-recursive: Move delete/modify handling into dedicated function
233 merge-recursive: Move process_entry's content merging into a function
234 merge-recursive: New data structures for deferring of D/F conflicts
235 merge-recursive: New function to assist resolving renames in-core only
236 merge-recursive: Have process_entry() skip D/F or rename entries
237 merge-recursive: Structure process_df_entry() to handle more cases
238 merge-recursive: Update conflict_rename_rename_1to2() call signature
239 merge-recursive: Update merge_content() call signature
240 merge-recursive: Avoid doubly merging rename/add conflict contents
241 merge-recursive: Move handling of double rename of one file to two
242 merge-recursive: Move handling of double rename of one file to other file
243 merge-recursive: Delay handling of rename/delete conflicts
244 merge-recursive: Delay content merging for renames
245 merge-recursive: Delay modify/delete conflicts if D/F conflict present
246 conflict_rename_delete(): Check whether D/F conflicts are still present
247 conflict_rename_rename_1to2(): Fix checks for presence of D/F conflicts
248 merge_content(): Check whether D/F conflicts are still present
249 handle_delete_modify(): Check whether D/F conflicts are still present
250 merge-recursive: Make room for directories in D/F conflicts
251 merge-recursive: Remove redundant path clearing for D/F conflicts
252 t3020 (ls-files-error-unmatch): remove stray '1' from end of file
253 t4017 (diff-retval): replace manual exit code check with test_expect_code
254 t100[12] (read-tree-m-2way, read_tree_m_u_2way): add missing &&
255 t4002 (diff-basic): use test_might_fail for commands that might fail
256 t4202 (log): Replace '<git-command> || :' with test_might_fail
257 t4019 (diff-wserror): add lots of missing &&
258 t4026 (color): remove unneeded and unchained command
259 t5602 (clone-remote-exec): add missing &&
260 t6016 (rev-list-graph-simplify-history): add missing &&
261 t7001 (mv): add missing &&
262 t7601 (merge-pull-config): add missing &&
263 t7800 (difftool): add missing &&
264 Introduce sane_unset and use it to ensure proper && chaining
267 Side-step sed line-ending "corruption" leading to t6038 failure.
268 Side-step MSYS-specific path "corruption" leading to t5560 failure.
269 Fix 'clone' failure at DOS root directory.
270 Fix Windows-specific macro redefinition warning.
271 Add MinGW-specific execv() override.
274 instaweb: fix WEBrick server support
275 instaweb: minimize moving parts for WEBrick
276 instaweb: add access+error logging for WEBrick
277 t9155: fix compatibility with older SVN
278 Documentation/git-svn: discourage "noMetadata"
281 mingw: do not crash on open(NULL, ...)
282 do not depend on signed integer overflow
283 inet_ntop: fix a couple of old-style decls
285 mingw: support waitpid with pid > 0 and WNOHANG
286 mingw: add kill emulation
287 daemon: use run-command api for async serving
288 daemon: use full buffered mode for stderr
289 daemon: get remote host address from root-process
290 mingw: import poll-emulation from gnulib
291 mingw: use poll-emulation from gnulib
292 daemon: use socklen_t
293 daemon: make --inetd and --detach incompatible
294 daemon: opt-out on features that require posix
295 msvc: opendir: fix malloc-failure
296 msvc: opendir: allocate enough memory
297 msvc: opendir: do not start the search
298 win32: dirent: handle errors
299 msvc: opendir: handle paths ending with a slash
300 win32: use our own dirent.h
301 mingw: do not set errno to 0 on success
302 help: always suggest common-cmds if prefix of cmd
303 exec_cmd: remove unused extern
305 Eyvind Bernhardsen (3):
306 Avoid conflicts when merging branches with mixed normalization
307 Try normalizing files to avoid delete/modify conflicts when merging
308 Don't expand CRLFs when normalizing text during merge
311 Fix git-apply with -p greater than 1
314 Change regerror() declaration from K&R style to ANSI C (C89)
317 t5550: test HTTP authentication and userinfo decoding
318 Fix username and password extraction from HTTP URLs
320 Giuseppe Bilotta (16):
321 gitweb: use fullname as hash_base in heads link
322 gitweb: introduce remote_heads feature
323 gitweb: git_get_heads_list accepts an optional list of refs
324 gitweb: separate heads and remotes lists
325 gitweb: nagivation menu for tags, heads and remotes
326 gitweb: allow action specialization in page header
327 gitweb: remotes view for a single remote
328 gitweb: refactor repository URL printing
329 gitweb: provide a routine to display (sub)sections
330 gitweb: group remote heads by remote
331 git instaweb: enable remote_heads
332 web--browse: coding style
333 web--browse: split valid_tool list
334 web--browse: support opera, seamonkey and elinks
335 web--browse: better support for chromium
336 CodingGuidelines: mention whitespace preferences for shell scripts
339 split_cmdline: Allow caller to access error string
340 Allow creation of arbitrary git-shell commands
341 Add interactive mode to git-shell for user-friendliness
342 Add sample commands for git-shell
343 shell: Display errors from improperly-formatted command lines
346 Teach ref iteration module about submodules
347 setup_revisions(): Allow walking history in a submodule
348 Implement automatic fast-forward merge for submodules
349 add configuration variable for --autosquash option of interactive rebase
352 Add bidirectional_transfer_loop()
355 remote-fd/ext: finishing touches after code review
358 gitweb: Fix typo in run() subroutine
359 t/gitweb-lib.sh: Use GIT_BUILD_DIR
360 t/gitweb-lib.sh: Use tabs for indent consistently
361 gitweb: Move call to evaluate_git_version after evaluate_gitweb_config
362 t/gitweb-lib.sh: Add support for GITWEB_TEST_INSTALLED
363 gitweb/Makefile: Add 'test' and 'test-installed' targets
364 gitweb/Makefile: Include gitweb/config.mak
365 gitweb: Fix test of highlighting support in t9500
366 gitweb: Fix bug in evaluate_path_info
367 gitweb: Improve behavior for actionless path_info gitweb URLs
368 gitweb: Time::HiRes is in core for Perl 5.8
369 gitweb: selectable configurations that change with each request
370 gitweb: Fix handling of whitespace in generated links
371 gitweb: Introduce esc_attr to escape attributes of HTML elements
372 gitweb: Include links to feeds in HTML header only for '200 OK' response
373 gitweb: Mention optional Perl modules in INSTALL
376 read-tree: deprecate syntax without tree-ish args
377 repack: add -F flag to let user choose between --no-reuse-delta/object
378 Documentation: pack.compression: explain how to recompress
381 Convert "! git" to "test_must_fail git"
382 Add -e/--exclude to git-clean.
383 Add test for git clean -e.
384 builtin/push.c: remove useless temporary variable
385 Document git-instaweb start/stop/restart
386 Fix whitespace issue in object.c
389 git-commit.txt: (synopsis): move -i and -o before "--"
390 git-pull.txt: Mention branch.autosetuprebase
393 Add treap implementation
396 git-ls-files.txt: clarify -x/--exclude option
399 docs: fix Makefile dependency for user manual
400 pass "git -c foo=bar" params through environment
401 tests: make test_must_fail more verbose
402 tests: make test_must_fail fail on missing commands
403 diff: don't use pathname-based diff drivers for symlinks
404 prefer test -h over test -L in shell scripts
405 rev-list: handle %x00 NUL in user format
406 tests: factor out terminal handling from t7006
407 tests: test terminal output to both stdout and stderr
408 push: pass --progress down to git-pack-objects
409 docs: give more hints about how "add -e" works
410 config: treat non-existent config files as empty
411 diff: report bogus input to -C/-M/-B
412 apply: don't segfault on binary files with missing data
413 docs: clarify git diff modes of operation
414 docs: give more hints about how "add -e" works
415 document sigchain api
416 log.decorate: accept 0/1 bool values
417 allow command-specific pagers in pager.<cmd>
418 reflogs: clear flags properly in corner case
419 docs: default to more modern toolset
420 default color.status.branch to "same as header"
421 tests: add some script lint checks
422 tests: flip executable bit on t9158
423 handle arbitrary ints in git_config_maybe_bool
424 t2107: mark passing test as success
425 ident: die on bogus date format
426 docs: explain diff.*.binary option
427 rebase: use explicit "--" with checkout
428 rebase: give a better error message for bogus branch
429 tests: sanitize more git environment variables
432 Submodules: Add the new "ignore" config option for diff and status
433 Submodules: Use "ignore" settings from .gitmodules too for diff and status
434 Add tests for the diff.ignoreSubmodules config option
435 checkout: Add test for diff.ignoreSubmodules
436 checkout: Use submodule.*.ignore settings from .git/config and .gitmodules
437 t7405: cd inside subshell instead of around
438 t7406 & t7407: add missing && at end of lines
439 t5505: add missing &&
440 t3404 & t7508: cd inside subshell instead of around
441 Several tests: cd inside subshell instead of around
442 t1020: Get rid of 'cd "$HERE"' at the start of each test
443 pull: Remove --tags option from manpage
444 clone: Add the --recurse-submodules option as alias for --recursive
445 fetch/pull: Add the --recurse-submodules option
446 Add the 'fetch.recurseSubmodules' config setting
447 Submodules: Add the "fetchRecurseSubmodules" config option
448 git submodule: Remove now obsolete tests before cloning a repo
449 t5526: Fix wrong argument order in "git config"
450 pull: Document the "--[no-]recurse-submodules" options
453 Fix typo in git-gc document.
456 mailmap: fix use of freed memory
459 git-send-email.perl: Add --to-cmd
460 git-send-email.perl: Deduplicate "to:" and "cc:" entries with names
463 Make graph_next_line() available in the graph.h API
464 Enable custom schemes for column colors in the graph API
465 notes: Don't create (empty) commit when removing non-existing notes
466 notes.c: Hexify SHA1 in die() message from init_notes()
467 (trivial) notes.h: Minor documentation fixes to copy_notes()
468 notes.h: Make default_notes_ref() available in notes API
469 notes.c: Reorder functions in preparation for next commit
470 notes.h/c: Allow combine_notes functions to remove notes
471 notes.h/c: Propagate combine_notes_fn return value to add_note() and beyond
472 (trivial) t3303: Indent with tabs instead of spaces for consistency
473 notes.c: Use two newlines (instead of one) when concatenating notes
474 builtin/notes.c: Split notes ref DWIMmery into a separate function
475 git notes merge: Initial implementation handling trivial merges only
476 builtin/notes.c: Refactor creation of notes commits.
477 git notes merge: Handle real, non-conflicting notes merges
478 git notes merge: Add automatic conflict resolvers (ours, theirs, union)
479 Documentation: Preliminary docs on 'git notes merge'
480 git notes merge: Manual conflict resolution, part 1/2
481 git notes merge: Manual conflict resolution, part 2/2
482 git notes merge: List conflicting notes in notes merge commit message
483 git notes merge: --commit should fail if underlying notes ref has moved
484 git notes merge: Add another auto-resolving strategy: "cat_sort_uniq"
485 git notes merge: Add testcases for merging notes trees at different fanouts
486 Provide 'git notes get-ref' to easily retrieve current notes ref
487 cmd_merge(): Parse options before checking MERGE_HEAD
488 Provide 'git merge --abort' as a synonym to 'git reset --merge'
490 Johannes Schindelin (5):
491 Add the 'diff.ignoreSubmodules' config setting
492 checkout: respect diff.ignoreSubmodules setting
493 Make sure that git_getpass() never returns NULL
494 Fix typo in pack-objects' usage
495 merge-octopus: Work around environment issue on Windows
498 Fix compat/regex ANSIfication on MinGW
499 fast-export: ensure that a renamed file is printed after all references
500 t7300: add a missing SYMLINKS prerequisite
501 apply --whitespace=fix: fix tab-in-indent
502 Make the tab width used for whitespace checks configurable
503 Avoid duplicate test number t7609
504 Fix expected values of setup tests on Windows
505 t/README: hint about using $(pwd) rather than $PWD in tests
506 start_command: flush buffers in the WIN32 code path as well
507 t4120-apply-popt: help systems with core.filemode=false
510 detached-stash: introduce parse_flags_and_revs function
511 detached-stash: work around git rev-parse failure to detect bad log refs
512 detached-stash: simplify stash_apply
513 detached-stash: simplify stash_drop
514 detached-stash: refactor git stash pop implementation
515 detached-stash: simplify git stash branch
516 detached-stash: simplify git stash show
517 detached-stash: tests of git stash with stash-like arguments
518 detached-stash: update Documentation
519 rev-parse: exit with non-zero status if ref@{n} is not valid.
520 sha1_name.c: use warning in preference to fprintf(stderr
521 rev-parse: tests git rev-parse --verify master@{n}, for various n
522 t1503: fix broken test_must_fail calls
523 t3903: fix broken test_must_fail calls
524 stash: fix git stash branch regression when branch creation fails
525 stash: simplify parsing fixes
527 Jonathan "Duke" Leto (1):
528 Correct help blurb in checkout -p and friends
530 Jonathan Nieder (191):
531 Teach fast-import to import subtrees named by tree id
532 Export parse_date_basic() to convert a date string to timestamp
533 t1501 (rev-parse): clarify
534 tests: try git apply from subdir of toplevel
535 setup: split off $GIT_DIR-set case from setup_git_directory_gently
536 setup: split off a function to checks working dir for .git file
537 setup: split off code to handle stumbling upon a repository
538 setup: split off a function to handle hitting ceiling in repo search
539 setup: split off get_device_or_die helper
540 t1011 (sparse checkout): style nitpicks
541 gitweb: allow configurations that change with each request
542 t4111 (apply): refresh index before applying patches to it
543 diff: split off a function for --stat-* option parsing
544 t6038 (merge.renormalize): style nitpicks
545 t6038 (merge.renormalize): try checkout -m and cherry-pick
546 t6038 (merge.renormalize): check that it can be turned off
547 merge-trees: push choice to renormalize away from low level
548 merge-trees: let caller decide whether to renormalize
549 Documentation/technical: document ll_merge
550 ll-merge: make flag easier to populate
551 ll-merge: let caller decide whether to renormalize
552 t4200 (rerere): modernize style
553 rerere: migrate to parse-options API
554 rerere: never renormalize
555 merge-recursive --renormalize
556 Introduce vcs-svn lib
558 svn-fe manual: Clarify warning about deltas in dump files
559 vcs-svn: remove build artifacts on "make clean"
561 compat: add strtok_r()
562 vcs-svn: Rename dirent pool to build on Windows
563 vcs-svn: Avoid %z in format string
564 t9010 (svn-fe): use Unix-style path in URI
565 t9010 (svn-fe): avoid symlinks in test
566 Eliminate “Finished cherry-pick/revert” message
567 Introduce advise() to print hints
568 cherry-pick/revert: Use error() for failure message
569 cherry-pick/revert: Use advise() for hints
570 t7606 (merge-theirs): modernize style
571 merge: let custom strategies intervene in trivial merges
572 t7006 (pager): add missing TTY prerequisites
573 merge: do not mistake (ancestor of) tag for branch
574 t7600 (merge): modernize style
575 t7600 (merge): do not launch gitk for --debug
576 t7600 (merge): check reflog entry
577 t7600 (merge): test merge from branch yet to be born
578 t6010 (merge-base): modernize style
579 t6200 (fmt-merge-msg): style nitpicks
580 Documentation: add a SEE ALSO section for merge-base
581 merge-base --octopus to mimic show-branch --merge-base
582 merge-base --independent to print reduced parent list in a merge
583 fmt-merge-msg -m to override merge title
584 merge script: --squash, --ff from unborn branch are errors
585 merge script: tweak unmerged files message to match builtin
586 merge script: refuse to merge during merge
587 merge script: improve log message subject
588 merge script: merge -X<option>
589 merge script: allow custom strategies
590 merge script: forbid merge -s index
591 merge script: handle -m --log correctly
592 merge script: handle many-way octopus
593 merge script: --ff-only to disallow true merge
594 merge script: handle --no-ff --no-commit correctly
595 merge script: notice @{-1} shorthand
596 merge script: learn --[no-]rerere-autoupdate
597 autoconf: don't use platform regex if it lacks REG_STARTEND
598 Documentation: set a !DOCTYPE for user manual
599 Documentation: tweak description of log.date
600 Documentation: quoting trouble in "git rm" discussion
601 Documentation: unbreak regex in show-ref manual
602 Documentation: clarify quoting in "git add" example
603 Documentation: add missing quotes to "git grep" examples
604 Documentation: clarify quoting in "git rm" example
605 Documentation: clarify quoting in gitignore docs
606 Documentation: remove backslashes in manpage synopses
607 Documentation/technical: avoid stray backslash in parse-options API docs
608 Documentation: remove stray backslash from "git bundle" manual
609 Documentation: remove backslash before ~ in fast-import manual
610 Documentation: remove stray backslashes in rev-parse manual
611 Documentation: avoid stray backslashes in core tutorial
612 Documentation: avoid stray backslash in user manual
613 Documentation: do not convert ... operator to ellipses
614 Documentation: remove stray backslashes from "Fighting regressions" article
615 Documentation: remove stray backslash in show-branch discussion
616 apply: split quoted filename handling into new function
617 tests: exercise "git apply" with weird filenames
618 apply: handle traditional patches with space in filename
619 do not pass "git -c foo=bar" params to transport helpers
620 merge-recursive: expose merge options for builtin merge
621 ll-merge: replace flag argument with options struct
622 tests: make test_might_fail more verbose
623 tests: make test_might_fail fail on missing commands
624 tests: simplify "missing PREREQ" message
625 tests: subshell indentation stylefix
626 t1450 (fsck): remove dangling objects
627 t2105 (gitfile): add missing &&
628 t1302 (core.repositoryversion): style tweaks
629 t2016 (checkout -p): add missing &&
630 t0004 (unwritable files): simplify error handling
631 environment.c: remove unused variable
632 setup: make sure git dir path is in a permanent buffer
633 init: plug tiny one-time memory leak
634 xdiff: cast arguments for ctype functions to unsigned char
635 commit-tree: free commit message before exiting
636 Documentation: No argument of ALLOC_GROW should have side-effects
637 Documentation: gitrevisions is in section 7
638 Documentation: diff can compare blobs
639 Documentation: expand 'git diff' SEE ALSO section
640 Documentation: update implicit "--no-index" behavior in "git diff"
641 t4203 (mailmap): stop hardcoding commit ids and dates
642 send-pack: avoid redundant "pack-objects died with strange error"
643 test-lib: allow test code to check the list of declared prerequisites
644 test_terminal: catch use without TTY prerequisite
645 test_terminal: ensure redirections work reliably
646 fast-import: filemodify after M 040000 <tree> "" crashes
647 fast-import: tighten M 040000 syntax
648 t9300 (fast-import): another test for the "replace root" feature
649 fast-import: do not clear notes in do_change_note_fanout()
650 user-manual: remote-tracking can be checked out, with detached HEAD
651 Documentation: document show -s
652 tests: add missing &&
653 tests: add missing &&, batch 2
654 test-lib: introduce test_line_count to measure files
655 t6022 (renaming merge): chain test commands with &&
656 t1502 (rev-parse --parseopt): test exit code from "-h"
657 t1400 (update-ref): use test_must_fail
658 t3301 (notes): use test_expect_code for clarity
659 t3404 (rebase -i): unroll test_commit loops
660 t3404 (rebase -i): move comment to description
661 t3404 (rebase -i): introduce helper to check position of HEAD
662 t4124 (apply --whitespace): use test_might_fail
663 apply: handle patches with funny filename and colon in timezone
664 cherry-pick/revert: transparently refresh index
665 wrapper: move xmmap() to sha1_file.c
666 wrapper: move odb_* to environment.c
667 path helpers: move git_mkstemp* to wrapper.c
668 strbuf: move strbuf_branchname to sha1_name.c
669 wrapper: give zlib wrappers their own translation unit
670 pack-objects: mark file-local variable static
671 Remove pack file handling dependency from wrapper.o
672 Documentation: split gitignore page into sections
673 Documentation: point to related commands from gitignore
674 Describe various forms of "be quiet" using OPT__QUIET
675 vcs-svn: Error out for v3 dumps
676 fast-import: treat SIGUSR1 as a request to access objects early
677 git-rev-parse.txt: clarify --git-dir
678 gitweb: document $per_request_config better
679 fast-import: stricter parsing of integer options
680 fast-import: clarify documentation of "feature" command
681 fast-import: Allow cat-blob requests at arbitrary points in stream
682 add: introduce add.ignoreerrors synonym for add.ignore-errors
683 Documentation: do not misinterpret pull refspec as bold text
684 git submodule -b ... of current HEAD fails
685 Makefile: dependencies for vcs-svn tests
686 parse-options: clearer reporting of API misuse
687 parse-options: move NODASH sanity checks to parse_options_check
688 parse-options: sanity check PARSE_OPT_NOARG flag
689 parse-options: never suppress arghelp if LITERAL_ARGHELP is set
690 parse-options: allow git commands to invent new option types
691 parse-options: make resuming easier after PARSE_OPT_STOP_AT_NON_OPTION
692 update-index: migrate to parse-options API
693 treap: make treap_insert return inserted node
694 vcs-svn: fix intermittent repo_tree corruption
695 Makefile: transport-helper uses thread-utils.h
696 t9300: avoid short reads from dd
697 bash: simple reimplementation of _get_comp_words_by_ref
698 t9300: use perl "head -c" clone in place of "dd bs=1 count=16000" kluge
699 t0050: fix printf format strings for portability
700 t0001: test git init when run via an alias
701 diff: funcname and word patterns for perl
702 gitweb: skip logo in atom feed when there is none
703 gitweb: make logo optional
704 daemon: support <directory> arguments again
705 t9010: svnadmin can fail even if available
706 ll-merge: simplify opts == NULL case
707 Documentation/fast-import: capitalize beginning of sentence
708 remote-ext: do not segfault for blank lines
709 Documentation/fast-import: put explanation of M 040000 <dataref> "" in context
710 tests: cosmetic improvements to the repo-setup test
711 tests: compress the setup tests
712 Documentation: do not treat reset --keep as a special case
713 Subject: setup: officially support --work-tree without --git-dir
714 t1510: fix typo in the comment of a test
715 fast-import: treat filemodify with empty tree as delete
716 rebase -i: clarify in-editor documentation of "exec"
717 quote.h: simplify the inclusion
718 fast-import: clarify documentation of "feature" command
719 fast-import: introduce "feature notes" command
720 compat: helper for detecting unsigned overflow
721 svn-fe: warn about experimental status
724 Add string comparison functions that respect the ignore_case variable.
725 Case insensitivity support for .gitignore via core.ignorecase
726 Add case insensitivity support for directories when using git status
727 Add case insensitivity support when using git ls-files
728 Support case folding for git add when core.ignorecase=true
729 Support case folding in git fast-import when core.ignorecase=true
732 cvs tests: do not touch test CVS repositories shipped with source
733 compat/regex: get rid of old-style definition
734 autoconf: regex library detection typofix
735 Work around em-dash handling in newer AsciiDoc
736 gitdiffcore doc: update pickaxe description
737 diff: pass the entire diff-options to diffcore_pickaxe()
738 git log/diff: add -G<regexp> that greps in the patch text
739 diff/log -G<pattern>: tests
740 install-webdoc: filter timestamp-only changes correctly
742 tag.c: whitespace breakages fix
743 install-webdoc: keep installed RelNotes-*.txt
744 Prepare for 1.7.3 rc1
746 t3101: modernise style
747 ls-tree $di $dir: do not mistakenly recurse into directories
748 grep: move logic to compile header pattern into a separate helper
749 log --author: take union of multiple "author" requests
750 disallow branch names that start with a hyphen
752 ls-files documentation: reword for consistency
754 CodingGuidelines: spell Arithmetic Expansion with $(($var))
756 MinGW: avoid collisions between "tags" and "TAGS"
758 merge-recursive: Restructure showing how to chain more process_* functions
759 Martin Langhoff has a new e-mail address
760 Make test script t9157 executable
761 CodingGuidelines: reword parameter expansion section
762 shell portability: no "export VAR=VAL"
763 t4203: do not let "git shortlog" DWIM based on tty
764 merge-recursive:make_room_for_directories - work around dumb compilers
766 core.abbrevguard: Ensure short object names stay unique a bit longer
767 read_sha1_file(): report correct name of packfile with a corrupt object
768 A loose object is not corrupt if it cannot be read due to EMFILE
769 t9001: send-email interation with --in-reply-to and --chain-reply-to
770 test: git-apply -p2 rename/chmod only
771 t3404: do not use 'describe' to implement test_cmp_rev
772 t3402: test "rebase -s<strategy> -X<opt>"
773 Update draft release notes to 1.7.4
774 Documentation: Fix mark-up of lines with more than one tilde
776 Update draft release notes to 1.7.4
777 t9300: remove unnecessary use of /dev/stdin
779 t9119: do not compare "Text Last Updated" line from "svn info"
780 Do not link with -lcrypto under NO_OPENSSL
781 t9010 fails when no svn is available
782 get_sha1: teach ":$n:<path>" the same relative path logic
783 Documentation/git.txt: update list of maintenance releases
784 fetch_populated_submodules(): document dynamic allocation
785 thread-utils.h: simplify the inclusion
787 Relnotes: remove items fixed on 'maint'
788 get_sha1_oneline: fix lifespan rule of temp_commit_buffer variable
791 Update draft release notes to 1.7.4
792 commit: die before asking to edit the log message
793 set_try_to_free_routine(NULL) means "do nothing special"
794 am --abort: keep unrelated commits since the last failure and warn
795 t0021: avoid getting filter killed with SIGPIPE
796 rebase --skip: correctly wrap-up when skipping the last patch
797 userdiff/perl: catch BEGIN/END/... and POD as headers
803 Documentation updates for 'GIT_WORK_TREE without GIT_DIR' historical usecase
805 fsck: drop unused parameter from traverse_one_object()
806 fsck: do not give up too early in fsck_dir()
811 merge-recursive --patience
812 merge-recursive: options to ignore whitespace changes
815 merge-recursive: option to specify rename threshold
816 diff: add synonyms for -M, -C, -B
817 completion: Support the DWIM mode for git checkout
818 blame: Add option to show author email instead of name
819 Update test script annotate-tests.sh to handle missing/extra authors
820 test-lib: extend test_decode_color to handle more color codes
821 diff: handle lines containing only whitespace and tabs better
822 submodule: preserve all arguments exactly when recursing
823 submodule: only preserve flags across recursive status/update invocations
824 status: Quote paths with spaces in short format
825 rebase: better rearranging of fixup!/squash! lines with --autosquash
826 rebase: teach --autosquash to match on sha1 in addition to message
827 diff: add --detect-copies-harder as a synonym for --find-copies-harder
829 Kevin P. Fleming (2):
830 post-receive-email: optional message line count limit
831 post-receive-email: ensure sent messages are not empty
834 gitk: Show notes by default (like git log does)
835 user-manual: be consistent in illustrations to 'git rebase'
836 blame,cat-file: Prepare --textconv tests for correctly-failing conversion program
837 blame,cat-file: Demonstrate --textconv is wrongly running converter on symlinks
838 blame,cat-file --textconv: Don't assume mode is ``S_IFREF | 0664''
839 setup: make sure git_dir path is in a permanent buffer, getenv(3) case
840 t/t8006: Demonstrate blame is broken when cachetextconv is on
841 fill_textconv(): Don't get/put cache if sha1 is not valid
844 Allow core.askpass to override SSH_ASKPASS.
845 Extend documentation of core.askpass and GIT_ASKPASS.
848 Fix missing 'does' in man-page for 'git checkout'
851 completion: make compatible with zsh
852 config.txt: fix placement of diff.noprefix
853 completion: fix zsh check under bash with 'set -u'
854 fsck docs: remove outdated and useless diagnostic
857 add support for the SUA layer (interix; windows)
858 Interix: add configure checks
861 Improve the mingw getaddrinfo stub to handle more use cases
863 Martin von Zweigbergk (7):
864 rebase -X: do not clobber strategy
865 Documentation/git-pull: clarify configuration
866 rebase: support --verify
867 rebase --abort: do not update branch ref
868 rebase: only show stat if configured to true
869 Use reflog in 'pull --rebase . foo'
870 completion: add missing configuration variables
873 git-svn: fix processing of decorated commit hashes
876 diff: parse separate options like -S foo
877 diff: parse separate options --stat-width n, --stat-name-width n
878 log: parse separate options like git log --grep foo
879 log: parse separate option for --glob
880 rebase -i: add exec command to launch a shell command
881 test-lib: user-friendly alternatives to test [-d|-f|-e]
882 Turn unpack_trees_options.msgs into an array + enum
883 merge-recursive: distinguish "removed" and "overwritten" messages
884 unpack_trees: group error messages by type
885 git-gui: use shell to launch textconv filter in "blame"
886 tests: factor HOME=$(pwd) in test-lib.sh
887 Move set_porcelain_error_msgs to unpack-trees.c and rename it
888 setup_unpack_trees_porcelain: take the whole options struct as parameter
889 Move "show_all_errors = 1" to setup_unpack_trees_porcelain()
890 t7609-merge-co-error-msgs: test non-fast forward case too.
891 update comment and documentation for :/foo syntax
892 diff: trivial fix for --output file error message
893 Better "Changed but not updated" message in git-status
894 Replace "remote tracking" with "remote-tracking"
895 Change remote tracking to remote-tracking in non-trivial places
896 everyday.txt: change "tracking branch" to "remote-tracking branch"
897 Change "tracking branch" to "remote-tracking branch"
898 Change incorrect uses of "remote branch" meaning "remote-tracking"
899 Change incorrect "remote branch" to "remote tracking branch" in C code
900 user-manual.txt: explain better the remote(-tracking) branch terms
901 git-branch.txt: mention --set-upstream as a way to change upstream configuration
902 commit: suggest --amend --reset-author to fix commiter identity
904 Michael J Gruber (29):
905 git-bundle.txt: Cleanup
906 git-bundle.txt: whitespace cleanup
907 git-bundle.txt: Clarify rev-list-args restrictions
908 git-reset.txt: clarify branch vs. branch head
909 git-reset.txt: reset does not change files in target
910 git-reset.txt: reset --soft is not a no-op
911 git-reset.txt: use "working tree" consistently
912 git-reset.txt: point to git-checkout
913 git-reset.txt: make modes description more consistent
914 remote-helpers: build in platform independent directory
915 contrib/completion: --no-index option to git diff
916 user-manual: fix anchor name Finding-comments-With-given-Content
917 rev-list-options: clarify --parents and --children
919 git-show-ref.txt: clarify the pattern matching
920 test: allow running the tests under "prove"
921 t/t7004-tag: test handling of rfc1991 signatures
922 verify-tag: factor out signature detection
923 tag: factor out sig detection for body edits
924 tag: factor out sig detection for tag display
925 tag: recognize rfc1991 signatures
926 cvsimport: partial whitespace cleanup
927 git-rm.txt: Fix quoting
928 t800?-blame.sh: retitle uniquely
929 git-difftool.txt: correct the description of $BASE and describe $MERGED
930 difftool: provide basename to external tools
931 t1020-subdirectory: test alias expansion in a subdirectory
932 cvsimport: handle the parsing of uppercase config options
933 RelNotes/1.7.4: minor fixes
936 rebase: support -X to pass through strategy options
939 mingw: add network-wrappers for daemon
940 mingw: implement syslog
941 compat: add inet_pton and inet_ntop prototypes
943 Nathan W. Panike (1):
944 Fix a formatting error in git-merge.txt
946 Nguyễn Thái Ngọc Duy (94):
947 upload-pack: remove unused "create_full_pack" code in do_rev_list
948 setup: do not forget working dir from subdir of gitdir
949 Revert "rehabilitate 'git index-pack' inside the object store"
950 setup: split off a function to handle ordinary .git directories
951 unpack-trees: only clear CE_UPDATE|CE_REMOVE when skip-worktree is always set
952 unpack-trees: let read-tree -u remove index entries outside sparse area
953 unpack-trees: do not check for conflict entries too early
954 unpack-trees: mark new entries skip-worktree appropriately
955 git wrapper: introduce startup_info struct
956 setup: remember whether repository was found
957 git wrapper: allow setup_git_directory_gently() be called earlier
958 shortlog: run setup_git_directory_gently() sooner
959 grep: run setup_git_directory_gently() sooner
960 apply: run setup_git_directory_gently() sooner
961 bundle: run setup_git_directory_gently() sooner
962 config: run setup_git_directory_gently() sooner
963 index-pack: run setup_git_directory_gently() sooner
964 ls-remote: run setup_git_directory_gently() sooner
965 var: run setup_git_directory_gently() sooner
966 merge-file: run setup_git_directory_gently() sooner
967 clone: warn users --depth is ignored in local clones
968 parse_object: pass on the original sha1, not the replaced one
969 branch -h: show usage even in an invalid repository
970 checkout-index -h: show usage even in an invalid repository
971 commit/status -h: show usage even with broken configuration
972 gc -h: show usage even with broken configuration
973 ls-files -h: show usage even with corrupt index
974 merge -h: show usage even with corrupt index
975 update-index -h: show usage even with corrupt index
976 dir.c: fix EXC_FLAG_MUSTBEDIR match in sparse checkout
977 add: do not rely on dtype being NULL behavior
978 clean: avoid quoting twice
979 clean: remove redundant variable baselen
980 get_cwd_relative(): do not misinterpret root path
981 builtins: print setup info if repo is found
982 Add t1510 and basic rules that run repo setup
993 t1510: setup case #10
994 t1510: setup case #11
995 t1510: setup case #12
996 t1510: setup case #13
997 t1510: setup case #14
998 t1510: setup case #15
999 t1510: setup case #16
1000 t1510: setup case #17
1001 t1510: setup case #18
1002 t1510: setup case #19
1003 t1510: setup case #20
1004 t1510: setup case #21
1005 t1510: setup case #22
1006 t1510: setup case #23
1007 t1510: setup case #24
1008 t1510: setup case #25
1009 t1510: setup case #26
1010 t1510: setup case #27
1011 t1510: setup case #28
1012 t1510: setup case #29
1013 t1510: setup case #30
1014 t1510: setup case #31
1015 cache.h: realign and use (1 << x) form for CE_* constants
1016 dir.c: add free_excludes()
1017 unpack-trees: move all skip-worktree checks back to unpack_trees()
1018 entry.c: remove "checkout-index" from error messages
1019 unpack-trees: fix sparse checkout's "unable to match directories"
1020 Revert "excluded_1(): support exclude files in index"
1021 setup: save prefix (original cwd relative to toplevel) in startup_info
1022 Make prefix_path() return char* without const
1023 get_sha1: support relative path ":path" syntax
1024 get_sha1_oneline: make callers prepare the commit list to traverse
1025 get_sha1: support $commit^{/regex} syntax
1026 get_sha1: handle special case $commit^{/}
1027 Add git_config_early()
1028 Use git_config_early() instead of git_config() during repo setup
1029 setup: limit get_git_work_tree()'s to explicit setup case only
1030 setup: clean up setup_bare_git_dir()
1031 setup: clean up setup_discovered_git_dir()
1032 setup: rework setup_explicit_git_dir()
1033 Remove all logic from get_git_work_tree()
1034 Revert "Documentation: always respect core.worktree if set"
1035 git.txt: correct where --work-tree path is relative to
1036 setup_work_tree: adjust relative $GIT_WORK_TREE after moving cwd
1037 diff: support --cached on unborn branches
1038 Add const to parse_{commit,tag}_buffer()
1039 sha1_file.c: move find_cached_object up so sha1_object_info can use it
1040 sha1_object_info: examine cached_object store too
1043 Documentation: move RelNotes into a directory of their own
1044 diff: don't presume empty file when corresponding object is missing
1045 make pack-objects a bit more resilient to repo corruption
1048 Add --src/dst-prefix to git-formt-patch in git-rebase.sh
1051 Minor indentation fix.
1052 Remove @smtp_host_parts variable as not used.
1053 New send-email option smtpserveroption.
1056 strbuf.h: fix comment typo
1057 dir.c: squelch false uninitialized memory warning
1058 commit: helper methods to reduce redundant blocks of code
1059 pretty.c: teach format_commit_message() to reencode the output
1060 commit: --fixup option for use with rebase --autosquash
1061 add tests of commit --fixup
1062 commit: --squash option for use with rebase --autosquash
1063 add tests of commit --squash
1066 git-gui: Make usage statement visible on Windows.
1067 git-gui: display error launching blame as a message box.
1068 git-gui: handle textconv filter on Windows and in development
1069 git-gui: ensure correct application termination in git-gui--askpass
1070 git-gui: avoid mis-encoding the copyright message on Windows.
1072 MinGW: fix stat() and lstat() implementations for handling symlinks
1073 MinGW: Report errors when failing to launch the html browser.
1074 Skip t1300.70 and 71 on msysGit.
1075 Do not strip CR when grepping HTTP headers.
1076 Skip 'git archive --remote' test on msysGit
1077 git-am: fix detection of absolute paths for windows
1078 git-gui: show command-line errors in a messagebox on Windows
1079 git-gui: enable the Tk console when tracing/debugging on Windows
1080 git-gui: generic version trimming
1081 git-gui: use full dialog width for old name when renaming branch
1082 git-gui: correct assignment of work-tree
1083 git-gui: use wordprocessor tab style to ensure tabs work as expected
1084 git-gui: apply color information from git diff output
1085 t3509: use unconstrained initial test to setup repository.
1086 t7407: fix line endings for mingw build
1089 convert filter: supply path to external driver
1092 git-gui: Update Swedish translation (521t).
1093 gitk: Update Swedish translation (290t)
1095 Peter van der Does (1):
1096 bash: get --pretty=m<tab> completion to work with bash v4
1099 Userdiff patterns for C#
1100 Add global and system-wide gitattributes
1103 commit.c: Remove backward goto in read_craft_line()
1105 Ralf Wildenhues (2):
1106 Typos in code comments, an error message, documentation
1107 Fix typos in the documentation
1109 Ramkumar Ramachandra (12):
1110 builtin/checkout: Fix message when switching to an existing branch
1111 shell: Rewrite documentation and improve error message
1112 t4014-format-patch: Call test_tick before committing
1113 format-patch: Don't go over merge commits
1114 fmt_merge_msg: Change fmt_merge_msg API to accept shortlog_len
1115 merge: Make '--log' an integer option for number of shortlog entries
1116 merge: Make 'merge.log' an integer or boolean option
1117 t6200-fmt-merge-msg: Exercise 'merge.log' to configure shortlog length
1118 t6200-fmt-merge-msg: Exercise '--log' to configure shortlog length
1119 SubmittingPatches: Document some extra tags used in commit messages
1120 Porcelain scripts: Rewrite cryptic "needs update" error message
1121 t9010 (svn-fe): Eliminate dependency on svn perl bindings
1123 Ramsay Allan Jones (21):
1124 vcs-svn: Fix some printf format compiler warnings
1125 t1503: Fix arithmetic expansion syntax error when using dash
1126 msvc: Fix compilation errors in compat/win32/sys/poll.c
1127 msvc: git-daemon.exe: Fix linker "unresolved externals" error
1128 msvc: Fix build by adding missing INTMAX_MAX define
1129 msvc: Fix macro redefinition warnings
1130 t3600-rm.sh: Don't pass a non-existent prereq to test #15
1131 t9142: Move call to start_httpd into the setup test
1132 lib-git-svn.sh: Avoid setting web server variables unnecessarily
1133 lib-git-svn.sh: Add check for mis-configured web server variables
1134 t9501-*.sh: Fix a test failure on Cygwin
1135 difftool: Fix failure on Cygwin
1136 t3419-*.sh: Fix arithmetic expansion syntax error
1137 lib-git-svn.sh: Move web-server handling code into separate function
1138 t9157-*.sh: Add an svn version check
1139 t6038-*.sh: Pass the -b (--binary) option to sed on cygwin
1140 t3032-*.sh: Pass the -b (--binary) option to sed on cygwin
1141 t3032-*.sh: Do not strip CR from line-endings while grepping on MinGW
1142 t4135-*.sh: Skip the "backslash" tests on cygwin
1143 t9157-*.sh: Make the svn version check more precise
1144 svndump.c: Fix a printf format compiler warning
1147 compat/nedmalloc: don't force NDEBUG on the rest of git
1148 diff: avoid repeated scanning while looking for funcname
1149 work around buggy S_ISxxx(m) implementations
1150 add description parameter to OPT__VERBOSE
1151 add description parameter to OPT__DRY_RUN
1152 add description parameter to OPT__QUIET
1154 archive: improve --verbose description
1155 branch: improve --verbose description
1156 verify-tag: document --verbose
1157 close file on error in read_mmfile()
1159 Robin H. Johnson (2):
1160 Fix false positives in t3404 due to SHELL=/bin/false
1161 t9001: Fix test prerequisites
1164 bisect: improve error message of 'bisect log' while not bisecting
1165 bisect: improve error msg of 'bisect reset' when original HEAD is deleted
1166 bisect: check for mandatory argument of 'bisect replay'
1167 bash: offer refs for 'git bisect start'
1168 bash: not all 'git bisect' subcommands make sense when not bisecting
1169 bash: support more 'git notes' subcommands and their options
1170 bash: support pretty format aliases
1173 parse-remote: handle detached HEAD
1176 RE: [PATCH] Avoid rename/add conflict when contents are identical
1177 t3030: Add a testcase for resolvable rename/add conflict with symlinks
1179 Sebastian Schuberth (3):
1180 MinGW: Use pid_t more consequently, introduce uid_t for greater compatibility
1181 MinGW: Add missing file mode bit defines
1182 On Windows, avoid git-gui to call Cygwin's nice utility
1184 Shawn O. Pearce (3):
1185 Use git_open_noatime when accessing pack data
1186 Work around EMFILE when there are too many pack files
1187 bundle: Use OFS_DELTA in bundle files
1189 Sitaram Chamarty (1):
1190 post-receive-email: suppress error if description file missing
1192 Spencer E. Olson (1):
1193 Allow HTTP user agent string to be modified.
1196 gitk: Prevent the text pane from becoming editable
1197 gitk: Make text selectable on Mac
1200 send-email: Use To: headers in patch files
1201 send-email: Don't leak To: headers between patches
1202 parse-options: Don't call parse_options_check() so much
1203 parse-options: do not infer PARSE_OPT_NOARG from option type
1206 git svn: fix the final example in man page
1209 git svn: URL-decode left-hand side of svn refspec
1210 git-svn: check_cherry_pick should exclude commits already in our history
1211 git-svn: allow the mergeinfo property to be set
1214 contrib/ciabot: git-describe commit instead of HEAD
1216 Sverre Rabbelier (1):
1217 config: add --local option
1220 gitweb: add extensions to highlight feature map
1221 gitweb: remove unnecessary test when closing file descriptor
1224 add tests for checkout -b
1225 builtin/checkout: reword hint for -b
1226 builtin/checkout: learn -B
1227 builtin/checkout: handle -B from detached HEAD correctly
1228 smart-http: Don't change POST to GET when following redirect
1229 t5523-push-upstream: add function to ensure fresh upstream repo
1230 t5523-push-upstream: test progress messages
1231 format-patch: page output with --stdout
1232 t5550-http-fetch: add missing '&&'
1233 t5550-http-fetch: add test for http-fetch
1234 shift end_url_with_slash() from http.[ch] to url.[ch]
1235 url: add str wrapper for end_url_with_slash()
1236 http-backend: use end_url_with_slash()
1237 http-push: Normalise directory names when pushing to some WebDAV servers
1238 http-push: check path length before using it
1239 http-push: add trailing slash at arg-parse time, instead of later on
1240 http-fetch: rework url handling
1241 bash completion: add basic support for git-reflog
1244 string_list: Add STRING_LIST_INIT macro and make use of it.
1245 object.h: Add OBJECT_ARRAY_INIT macro and make use of it.
1246 builtin.h: Move two functions definitions to help.h.
1247 builtin/clean.c: Use STRING_LIST_INIT_NODUP.
1248 commit: Add commit_list prefix in two function names.
1249 builtin/branch.c: Use ALLOC_GROW instead of alloc_nr and xrealloc.
1250 builtin/rm.c: Use ALLOC_GROW instead of alloc_nr and xrealloc.
1253 Do not unquote + into ' ' in URLs
1254 ls-files: learn a debugging dump format
1255 Makefile: make gcov invocation configurable
1256 test: Introduce $GIT_BUILD_DIR
1257 send-email: Refuse to send cover-letter template subject
1258 prefix_filename(): safely handle the case where pfx_len=0
1259 merge-file: correctly find files when called in subdir
1260 repack: place temporary packs under .git/objects/pack/
1261 {cvs,svn}import: use the new 'git read-tree --empty'
1262 t0003: properly quote $HOME
1263 gitk: Add the equivalent of diff --color-words
1264 userdiff: fix typo in ruby and python word regexes
1265 Documentation/git-archive: spell --worktree-attributes correctly
1266 Documentation/githooks: post-rewrite-copy-notes never existed
1267 submodule: fix relative url parsing for scp-style origin
1268 t0000: quote TAP snippets in test code
1271 stash drops the stash even if creating the branch fails because it already exists
1274 Better advice on using topic branches for kernel development
1276 Torsten Bögershausen (1):
1277 t9143: do not fail when unhandled.log.gz is not created
1279 Uwe Kleine-König (3):
1280 get_author_ident_from_commit(): remove useless quoting
1281 Documentation/git-clone: describe --mirror more verbosely
1282 Documentation/merge subtree How-To: fix typo
1284 Vasyl' Vavrychuk (1):
1285 trace.c: mark file-local function static
1287 Wesley J. Landaker (1):
1288 Documentation: Refer to git-commit-tree in git-filter-branch help
1291 t/t3415: use && where applicable.
1292 Fix copy-pasted comments related to tree diff handling.
1293 Keep together options controlling the behaviour of diffcore-rename.
1294 Document that rev-list --graph triggers parent rewriting.
1295 diff: use "find" instead of "detect" as prefix for long forms of -M and -C
1298 bash: Match lightweight tags in prompt
1300 Ævar Arnfjörð Bjarmason (84):
1301 sha1_file: Show the the type and path to corrupt objects
1302 tests: Ignore the Test::Harness .prove file
1303 t/t6035-merge-dir-to-symlink.sh: Remove TODO on passing test
1304 SubmittingPatches: Clarify the Signed-off-by rules
1305 SubmittingPatches: Cite the 50 char subject limit
1306 perl/Makefile: Unset INSTALL_BASE when making perl.mak
1307 test-lib: Don't write test-results when HARNESS_ACTIVE
1308 test-lib: Add support for multiple test prerequisites
1309 test-lib: Print missing prerequisites in test output
1310 t/README: Document the predefined test prerequisites
1311 tests: A SANITY test prereq for testing if we're root
1312 test-lib: Multi-prereq support only checked the last prereq
1313 tests: Infrastructure for Git smoke testing
1314 t/README: Document the Smoke testing
1315 t/Makefile: Can't include GIT-BUILD-OPTIONS, it's a .sh
1316 t/README: Add SMOKE_{COMMENT,TAGS}= to smoke_report target
1317 gitignore: Ignore files generated by "make coverage"
1318 Makefile: Include subdirectories in "make cover" reports
1319 Makefile: Split out the untested functions target
1320 Makefile: Add cover_db target
1321 Makefile: Add cover_db_html target
1322 t/README: A new section about test coverage
1323 t/README: Add a note about the dangers of coverage chasing
1324 tests: implicitly skip SYMLINKS tests using <prereq>
1325 t/t4004-diff-rename-symlink.sh: use three-arg <prereq>
1326 t/t5800-remote-helpers.sh: Skip with prereq on python <2.4
1327 t/t7800-difftool.sh: Skip with prereq on no PERL
1328 t/README: Update "Skipping tests" to align with best practices
1329 t/t1304-default-acl: change from skip_all=* to prereq skip
1330 t/t5705-clone-2gb: change from skip_all=* to prereq skip
1331 t/t7005-editor: change from skip_all=* to prereq skip
1332 t/t5503-tagfollow: change from skip_all=* to prereq skip
1333 t/t4016-diff-quote: change from skip_all=* to prereq skip
1334 t/t3902-quoted: change from skip_all=* to prereq skip
1335 t/t3300-funny-names: change from skip_all=* to prereq skip
1336 git-notes: Run partial expensive test everywhere
1337 t/Makefile: Create test-results dir for smoke target
1338 tests: Move FILEMODE prerequisite to lib-prereq-FILEMODE.sh
1339 t/t3701-add-interactive.sh: change from skip_all=* to prereq skip
1340 lib-patch-mode tests: change from skip_all=* to prereq skip
1341 t/t9600-cvsimport.sh: change from skip_all=* to prereq skip
1342 t/t9001-send-email.sh: Remove needless PROG=* assignment
1343 t/t9001-send-email.sh: change from skip_all=* to prereq skip
1344 t/t9001-send-email.sh: convert setup code to tests
1345 t/t7105-reset-patch.sh: Add a PERL prerequisite
1346 t/t9601-cvsimport-vendor-branch.sh: Add a PERL prerequisite
1347 t/t9602-cvsimport-branches-tags.sh: Add a PERL prerequisite
1348 tests: fix syntax error in "Use advise() for hints" test
1349 compat/regex: use the regex engine from gawk for compat
1350 compat/regex: get the gawk regex engine to compile within git
1351 compat/regex: define out variables only used under RE_ENABLE_I18N
1352 t/t9010-svn-fe.sh: add an +x bit to this test
1353 t/t7008-grep-binary.sh: un-TODO a test that needs REG_STARTEND
1354 reset: suggest what to do upon "git reset --mixed <paths>"
1355 test-lib: Use $TEST_DIRECTORY or $GIT_BUILD_DIR instead of $(pwd) and ../
1356 test-lib: Use "$GIT_BUILD_DIR" instead of "$TEST_DIRECTORY"/../
1357 test-lib: Allow overriding of TEST_DIRECTORY
1358 t/t0000-basic.sh: Run the passing TODO test inside its own test-lib
1359 test-lib: use subshell instead of cd $new && .. && cd $old
1360 send-email: use catfile() to concatenate files
1361 Makefile: add CC to TRACK_CFLAGS
1362 perl: bump the required Perl version to 5.8 from 5.6.[21]
1363 perl: use "use warnings" instead of -w
1364 send-email: use lexical filehandle for opendir
1365 send-email: use lexical filehandles for $compose
1366 send-email: use lexical filehandles during sending
1367 send-email: get_patch_subject doesn't need a prototype
1368 send-email: file_declares_8bit_cte doesn't need a prototype
1369 send-email: unique_email_list doesn't need a prototype
1370 send-email: cleanup_compose_files doesn't need a prototype
1371 send-email: use \E***\Q instead of \*\*\*
1372 send-email: sanitize_address use $foo, not "$foo"
1373 send-email: sanitize_address use qq["foo"], not "\"foo\""
1374 send-email: use (?:) instead of () if no match variables are needed
1375 send-email: send_message die on $!, not $?
1376 send-email: make_message_id use "require" instead of "use"
1377 send-email: use Perl idioms in while loop
1378 send-email: is_rfc2047_quoted use qr// regexes
1379 send-email: extract_valid_address use qr// regexes
1380 Makefile & configure: add a NO_FNMATCH flag
1381 Makefile & configure: add a NO_FNMATCH_CASEFOLD flag
1382 test-lib: make test_expect_code a test command
1383 t7004-tag.sh: re-arrange git tag comment for clarity
1384 tests: use test_cmp instead of piping to diff(1)
1387 Use angles for placeholders consistently
1388 Fix odd markup in --diff-filter documentation
1389 Use parentheses and `...' where appropriate
1390 Remove stray quotes in --pretty and --format documentation
1391 Put a space between `<' and argument in pack-objects usage string
1392 Fix {update,checkout}-index usage strings
1393 CodingGuidelines: Add a section on writing documentation
1394 diff,difftool: Don't use the {0,2} notation in usage strings
1397 Version v1.7.2.3; changes since v1.7.1:
1398 ---------------------------------------
1401 Allow passing of configuration parameters in the command line
1402 Use strbufs instead of open-coded string manipulation
1404 Alexey Mahotkin (1):
1405 xdiff/xmerge.c: use memset() instead of explicit for-loop
1408 bash-completion: Fix __git_ps1 to work with "set -u"
1409 bash completion: Support "divergence from upstream" messages in __git_ps1
1412 textconv: make the API public
1413 textconv: support for blame
1414 t/t8006: test textconv support for blame
1417 diff: fix coloring of extended diff headers
1419 Björn Gustavsson (1):
1420 apply: Allow blank *trailing* context lines to match beyond EOF
1422 Björn Steinbrink (1):
1423 diff: Support visibility modifiers in the PHP hunk header regexp
1426 Add a macro DIFF_QUEUE_CLEAR.
1427 Make diffcore_std only can run once before a diff_flush
1428 Make git log --follow find copies among unmodified files.
1429 blame-options.txt: Add default value for `-M/-C` options.
1430 Add a prefix output callback to diff output
1431 Output the graph columns at the end of the commit message
1432 diff.c: Output the text graph padding before each diff line
1433 Emit a whole line in one go
1434 graph.c: register a callback for graph output
1435 Make --color-words work well with --graph
1436 diff.c: fix a graph output bug
1439 Documentation: cite git-am from git-apply
1442 t/t5800: skip if python version is older than 2.5
1443 git-request-pull.sh: remove -e switch to shell interpreter which breaks ksh
1444 t/t5150: remove space from sed script
1445 t/t7006: ignore return status of shell's unset builtin
1446 t/aggregate-results: accomodate systems with small max argument list length
1447 Makefile: add PYTHON_PATH to GIT-BUILD-OPTIONS
1448 Remove python 2.5'isms
1449 t/lib-pager.sh: remove unnecessary '^' from 'expr' regular expression
1450 t/t7811-grep-open.sh: ensure fake "less" is made executable
1451 t/t7811-grep-open.sh: remove broken/redundant creation of fake "less" script
1452 t/t9001: use egrep when regular expressions are involved
1453 t/t9700/test.pl: don't access private object members, use public access methods
1454 Makefile: remove some unnecessary curly braces
1455 Makefile: work around ksh's failure to handle missing list argument to for loop
1456 t/t0006: specify timezone as EST5 not EST to comply with POSIX
1457 t/README: clarify test_must_fail description
1458 t/t3700: convert two uses of negation operator '!' to use test_must_fail
1459 t/{t5541,lib-httpd}: replace problematic '!()' notation with test_must_fail
1460 t/: work around one-shot variable assignment with test_must_fail
1461 Makefile: link builtins residing in bin directory to main git binary too
1462 Makefile: make hard/symbolic links for non-builtins too
1463 git-rebase--interactive.sh: use printf instead of echo to print commit message
1464 t/t7003: replace \t with literal tab in sed expression
1467 unpack-trees: Make index lookahead less pessimal
1469 Brian Gernhardt (6):
1470 Makefile: Simplify handling of python scripts
1471 send-email: Cleanup { style
1472 send-email: Don't use FQDNs without a '.'
1473 Document send-email --smtp-domain
1474 send-email: Cleanup smtp-domain and add config
1475 t4027,4041: Use test -s to test for an empty file
1478 stash: Don't overwrite files that have gone from the index
1479 stash tests: stash can lose data in a file removed from the index
1482 Documentation/git-gc.txt: add reference to githooks
1485 whitespace: add tab-in-indent error class
1486 whitespace: tests for git-diff --check with tab-in-indent error class
1487 whitespace: replumb ws_fix_copy to take a strbuf *dst instead of char *dst
1488 whitespace: add tab-in-indent support for --whitespace=fix
1489 whitespace: tests for git-apply --whitespace=fix with tab-in-indent
1490 exec_cmd.c: replace hard-coded path list with one from <paths.h>
1492 Christian Couder (17):
1493 revert: use strbuf to refactor the code that writes the merge message
1494 revert: refactor merge recursive code into its own function
1495 merge: refactor code that calls "git merge-STRATEGY"
1496 merge: make function try_merge_command non static
1497 revert: add "--strategy" option to choose merge strategy
1498 revert: cleanup code for -x option
1499 revert: use run_command_v_opt() instead of execv_git_cmd()
1500 revert: refactor code into a do_pick_commit() function
1501 revert: change help_msg() to take no argument
1502 revert: allow cherry-picking more than one commit
1503 revert: add tests to check cherry-picking many commits
1504 Documentation/cherry-pick: describe passing more than one commit
1505 Documentation/revert: describe passing more than one commit
1506 diff: fix "git show -C -C" output when renaming a binary file
1507 commit: use value of GIT_REFLOG_ACTION env variable as reflog message
1508 revert: accept arbitrary rev-list options
1509 Documentation: grep: fix asciidoc problem with --
1511 Clemens Buchacher (7):
1512 do not overwrite files marked "assume unchanged"
1513 Documentation: git-add does not update files marked "assume unchanged"
1514 test get_git_work_tree() return value for NULL
1515 get_cwd_relative(): do not misinterpret suffix as subdirectory
1516 setup: document prefix
1517 quote.c: separate quoting and relative path generation
1518 ls-files: allow relative pathspec
1520 Clément Poulain (4):
1521 sha1_name: add get_sha1_with_context()
1522 textconv: support for cat_file
1523 t/t8007: test textconv support for cat-file
1524 git-gui: use textconv filter for diff and blame
1527 git-instaweb: Fix custom apache log placement
1528 git-instaweb: Fix Apache environment variable passing
1529 git-instaweb: Don't assume Apache executable is named apache2
1532 fetch: allow command line --tags to override config
1534 Daniel Knittl-Frank (1):
1535 Show branch information in short output of git status
1538 Documentation: Explain git-mergetool's use of temporary files
1539 submodule sync: Update "submodule.<name>.url"
1541 David D. Kilzer (1):
1542 Fix git rebase --continue to work with touched files
1545 hash_object: correction for zero length file
1548 xdiff: optimise for no whitespace difference when ignoring whitespace.
1551 Add `%B' in format strings for raw commit body in `git log' and friends
1552 Reorganize `git-log' man page to clarify common diff options.
1555 diff: add configuration option for disabling diff prefixes.
1558 t5520-pull: Add testcases showing spurious conflicts from git pull --rebase
1559 pull --rebase: Avoid spurious conflicts and reapplying unnecessary patches
1560 tree-walk: Correct bitrotted comment about tree_entry()
1563 git svn: avoid unnecessary '/' in paths for SVN
1566 git checkout: create unparented branch by --orphan
1567 Documentation: alter checkout --orphan description
1568 refs: split log_ref_write logic into log_ref_setup
1569 checkout --orphan: respect -l option always
1570 t3200: test -l with core.logAllRefUpdates options
1571 bash completion: add --orphan to 'git checkout'
1574 mingw: use _commit to implement fsync
1576 Eyvind Bernhardsen (4):
1577 Add tests for per-repository eol normalization
1578 Add per-repository eol normalization
1579 Rename the "crlf" attribute "text"
1580 Add "core.eol" config variable
1582 Finn Arne Gangstad (1):
1583 autocrlf: Make it work also for un-normalized repositories
1585 Fredrik Skolmli (1):
1586 Documentation: Spelling fix in protocol-capabilities.txt
1588 Gary V. Vaughan (18):
1589 Makefile: pass CPPFLAGS through to fllow customization
1590 Rewrite dynamic structure initializations to runtime assignment
1591 Makefile: -lpthread may still be necessary when libc has only pthread stubs
1592 enums: omit trailing comma for portability
1593 Do not use "diff" found on PATH while building and installing
1594 tests: use "test_cmp", not "diff", when verifying the result
1595 test_cmp: do not use "diff -u" on platforms that lack one
1596 git-compat-util.h: some platforms with mmap() lack MAP_FAILED definition
1597 Makefile: some platforms do not have hstrerror anywhere
1598 Make NO_{INET_NTOP,INET_PTON} configured independently
1599 Some platforms lack socklen_t type
1600 Allow disabling "inline"
1601 inline declaration does not work on AIX
1602 Makefile: SunOS 5.6 portability fix
1603 git-compat-util.h: use apparently more common __sgi macro to detect SGI IRIX
1604 Makefile: HPUX11 portability fixes
1605 Makefile: HP-UX 10.20 portability fixes
1606 Makefile: Tru64 portability fix
1609 git-submodule.sh: properly initialize shell variables
1611 Giuseppe Scrivano (1):
1612 print the usage string on stdout instead of stderr
1615 Check size of path buffer before writing into it
1616 Check size of path buffer before writing into it
1619 pack-refs: remove newly empty directories
1622 git-gui: check whether systems nice command works or disable it
1623 add missing && to submodule-merge testcase
1624 git-gui: fix usage of themed widgets variable
1625 git-gui: fix usage of _gitworktree when creating shortcut for windows
1626 git-gui: fix PATH environment for mingw development environment
1627 git-gui: fix shortcut creation on cygwin
1629 Henrik Grubbström (5):
1630 attr: Fixed debug output for macro expansion.
1631 attr: Allow multiple changes to an attribute on the same line.
1632 attr: Expand macros immediately when encountered.
1633 convert: Safer handling of $Id$ contraction.
1634 convert: Keep foreign $Id$ on checkout.
1637 Fix "Out of memory? mmap failed" for files larger than 4GB on Windows
1639 Ian Ward Comfort (1):
1640 rebase -i: Abort cleanly if new base cannot be checked out
1642 Jakub Narebski (19):
1643 autoconf: Check if <paths.h> exists and set HAVE_PATHS_H
1644 Export more test-related variables when running external tests
1645 gitweb: href(..., -path_info => 0|1)
1646 gitweb: Use nonlocal jump instead of 'exit' in die_error
1647 gitweb: Add custom error handler using die_error
1648 gitweb: Move generating page title to separate subroutine
1649 gitweb: Silence 'Variable VAR may be unavailable' warnings
1650 gitweb: Improve installation instructions in gitweb/INSTALL
1651 gitweb: Create install target for gitweb in Makefile
1652 gitweb: Refactor syntax highlighting support
1653 gitweb: Put all per-connection code in run() subroutine
1654 git-instaweb: Remove pidfile after stopping web server
1655 git-instaweb: Wait for server to start before running web browser
1656 git-instaweb: Add support for running gitweb via 'plackup'
1657 gitweb: Run in FastCGI mode if gitweb script has .fcgi extension
1658 gitweb: Fix typo in hash key name in %opts in git_header_html
1659 gitweb: Return or exit after done serving request
1660 gitweb: Move evaluate_gitweb_config out of run_request
1661 diff: strip extra "/" when stripping prefix
1664 git-am: suggest what to do with superfluous patches
1667 receive-pack: switch global variable 'commands' to a parameter
1668 receive-pack: detect aliased updates which can occur with symrefs
1669 t5516-fetch-push.sh: style cleanup
1670 commit.txt: clarify how --author argument is used
1671 am: use get_author_ident_from_commit instead of mailinfo when rebasing
1672 gitweb/Makefile: fix typo in gitweb.min.css rule
1673 MERGE_RR is in .git, not .git/rr-cache
1674 for-each-ref: fix objectname:short bug
1677 make commit_tree a library function
1678 introduce notes-cache interface
1679 textconv: refactor calls to run_textconv
1680 diff: cache textconv output
1681 diff: avoid useless filespec population
1682 script with rev-list instead of log
1683 handle "git --bare init <dir>" properly
1684 tests: rename duplicate t4205
1685 tests: chmod +x t5150
1686 docs: clarify meaning of -M for git-log
1687 make url-related functions reusable
1688 decode file:// and ssh:// URLs
1689 remove over-eager caching in sha1_file_name
1690 pull: do nothing on --dry-run
1691 Makefile: default pager on AIX to "more"
1692 commit: give advice on empty amend
1693 Makefile: default pager on AIX to "more"
1694 notes: check number of parameters to "git notes copy"
1695 t0006: test timezone parsing
1696 parse_date: fix signedness in timezone calculation
1697 test-date: fix sscanf type conversion
1700 git diff: rename test that had a conflicting name
1701 Add optional parameters to the diff option "--ignore-submodules"
1702 git submodule: ignore dirty submodules for summary and status
1703 Add the option "--ignore-submodules" to "git status"
1704 git add: Add the "--ignore-missing" option for the dry run
1705 git submodule add: Require the new --force option to add ignored paths
1706 t7403: add missing &&'s
1709 diff.c: Ensure "index $from..$to" line contains unambiguous SHA1s
1710 Documentation/rev-list-options.txt: Fix missing line in example history graph
1711 Documentation/rev-list-options.txt: Explain --ancestry-path
1712 revision: Fix typo in --ancestry-path error message
1713 revision: Turn off history simplification in --ancestry-path mode
1715 Johannes Schindelin (4):
1716 gitweb: Syntax highlighting support
1717 Unify code paths of threaded greps
1718 grep: Add the option '--open-files-in-pager'
1719 grep -O: allow optional argument specifying the pager (or editor)
1722 Modernize t5530-upload-pack-error.
1723 Make report() from usage.c public as vreportf() and use it.
1724 Fix signature of fcntl() compatibility dummy
1725 Windows: more pthreads functions
1726 Reimplement async procedures using pthreads
1727 Dying in an async procedure should only exit the thread, not the process.
1728 Enable threaded async procedures whenever pthreads is available
1729 Thread-safe xmalloc and xrealloc needs a recursive mutex
1730 Have set_try_to_free_routine return the previous routine
1731 Do not call release_pack_memory in malloc wrappers when GIT_TRACE is used
1732 Recent MinGW has a C99 implementation of snprintf functions
1733 merge-recursive: demonstrate an incorrect conflict with submodule
1734 t0005: work around strange $? in ksh when program terminated by a signal
1735 t3700-add: fix dependence on stdout and stderr buffering
1738 INSTALL: configure /etc/xml/catalog to build docs on Cygwin
1740 Jonathan Nieder (76):
1741 t7400: split setup into multiple tests
1742 t7400: clarify 'submodule add' tests
1743 t7400: clarify submodule update tests
1744 t5800: testgit helper requires Python support
1745 t7006: guard cleanup with test_expect_success
1746 t5704 (bundle): add tests for bundle --stdin
1747 fix "bundle --stdin" segfault
1748 tests for request-pull
1749 request-pull: protect against OPTIONS_KEEPDASHDASH from environment
1750 fsck: check ident lines in commit objects
1751 test-lib: Let tests specify commands to be run at end of test
1752 commit --amend: cope with missing display name
1753 Documentation/shortlog: scripted users should not rely on implicit HEAD
1754 t4201 (shortlog): guard setup with test_expect_success
1755 t4201 (shortlog): Test output format with multiple authors
1756 shortlog: Document and test --format option
1757 test-lib: some shells do not let $? propagate into an eval
1758 adapt request-pull tests for new pull request format
1759 pretty: initialize new cmt_fmt_map to 0
1760 cherry-pick: do not dump core when iconv fails
1761 Documentation/notes: document format of notes trees
1762 Documentation/notes: describe content of notes blobs
1763 Documentation/notes: add configuration section
1764 Documentation/notes: simplify treatment of default notes ref
1765 Documentation/log: add a CONFIGURATION section
1766 Documentation/notes: simplify treatment of default display refs
1767 Documentation/notes: clean up description of rewriting configuration
1768 Documentation/notes: nitpicks
1769 Makefile: fix header dependency checker to allow NO_CURL builds
1770 Makefile: let header dependency checker override COMPUTE_HEADER_DEPENDENCIES
1771 git svn: avoid uninitialized var in 'reset'
1772 post-receive-email: document command-line mode
1773 Add git remote set-branches
1774 fsck: fix bogus commit header check
1775 Documentation/checkout: clarify description
1776 rebase: improve error message when upstream argument is missing
1777 gitignore.5: Clarify matching rules
1778 DWIM 'git show -5' to 'git show --do-walk -5'
1779 rebase -i -p: document shortcomings
1780 Documentation/checkout: clarify description
1781 grep: refactor grep_objects loop into its own function
1782 add-interactive: Clarify “remaining hunks in the file”
1783 git-svn: strip off leading slashes on --trunk argument
1784 t3508 (cherry-pick): futureproof against unmerged files
1785 t7006 (pager): introduce helper for parameterized tests
1786 t7006: test pager configuration for several git commands
1787 tests: local config file should be honored from subdirs of toplevel
1788 revert: do not rebuild argv on heap
1789 t/README: document more test helpers
1790 t9118 (git-svn): prevent early failure from taking down later tests
1791 t3000 (ls-files -o): modernize style
1792 git --paginate: paginate external commands again
1793 gitmodules.5: url can be a relative path
1794 Documentation: add submodule.* to the big configuration variable list
1795 Add a sample user for the svndump library
1796 t/README: correct an exception when breaking a && chain in tests
1797 t4150 (am): style fix
1798 t4150 (am): futureproof against failing tests
1799 t3400 (rebase): whitespace cleanup
1800 config --get --path: check for unset $HOME
1801 archive: abbreviate substituted commit ids again
1802 checkout, commit: remove confusing assignments to rev.abbrev
1803 examples/commit: use --abbrev for commit summary
1804 Documentation: flesh out “git pull” description
1805 check-ref-format: handle subcommands in separate functions
1806 Allow "check-ref-format --branch" from subdirectory
1807 Makefile: add missing dependencies on url.h
1808 Makefile: add missing dependency on http.h
1809 Documentation: add a FILES section for show-ref
1810 gitweb: clarify search results page when no matching commit found
1811 core: Stop leaking ondisk_cache_entrys
1812 read-tree: stop leaking tree objects
1813 write-tree: Avoid leak when index refers to an invalid object
1814 Standardize do { ... } while (0) style
1815 t3302 (notes): Port to Solaris
1816 parse-options: clarify PARSE_OPT_NOARG description
1818 Julian Phillips (6):
1819 string_list: Fix argument order for print_string_list
1820 string_list: Fix argument order for for_each_string_list
1821 string_list: Fix argument order for string_list_insert
1822 string_list: Fix argument order for string_list_insert_at_index
1823 string_list: Fix argument order for string_list_lookup
1824 string_list: Fix argument order for string_list_append
1826 Junio C Hamano (70):
1827 git_config_maybe_bool()
1828 log.decorate: usability fixes
1829 whitespace: we cannot "catch all errors known to git" anymore
1830 GIT_ONE_FILESYSTEM: flip the default to stop at filesystem boundaries
1831 Rename ONE_FILESYSTEM to DISCOVERY_ACROSS_FILESYSTEM
1832 log --pretty/--oneline: ignore log.decorate
1833 war on "sleep" in tests
1834 reflog --expire-unreachable: avoid merge-base computation
1835 log.decorate: only ignore it under "log --pretty=raw"
1836 wt-status: remove unused workdir_untracked member
1837 wt-status: plug memory leak while collecting untracked files
1838 wt-status: collect ignored files
1839 wt-status: rename and restructure status-print-untracked
1840 status: --ignored option shows ignored files
1841 am -3: recover the diagnostic messages for corrupt patches
1842 Document gc.<pattern>.reflogexpire variables
1843 more war on "sleep" in tests
1844 reflog --expire-unreachable: special case entries in "HEAD" reflog
1845 revision: --ancestry-path
1846 wt-status: fix 'fprintf' compilation warning
1847 clone: quell the progress report from init and report on clone
1848 t5150: protect backslash with backslash in shell
1850 fixup: do not unconditionally disable "diff -u"
1851 t9129: fix UTF-8 locale detection
1852 build: propagate $DIFF to scripts
1853 test-lib: use DIFF definition from GIT-BUILD-OPTIONS
1854 Update draft release notes to 1.7.2
1855 common_prefix: simplify and fix scanning for prefixes
1856 Prepare draft release notes to 1.7.1.1
1857 Update draft release notes to 1.7.2
1858 Update draft release notes to 1.7.2
1859 Update draft release notes to 1.7.1.1
1860 Drop items that are 1.7.1.1 fixes from the 1.7.1 release notes
1861 tests: remove unnecessary '^' from 'expr' regular expression
1862 Update draft release notes to 1.7.1.1
1863 Update draft release notes to 1.7.2
1864 url.c: "<scheme>://" part at the beginning should not be URL decoded
1865 url_decode: URL scheme ends with a colon and does not require a slash
1867 Update draft release notes to 1.7.1.1
1869 git.spec.in: Add gitweb subpackage
1871 Updates from the list to 1.7.2 Release Notes
1872 t/README: proposed rewording...
1874 rebase-i: do not get fooled by a log message ending with backslash
1875 do not write out index when status does not have to
1876 backmerge a few more fixes to 1.7.1.X series
1878 Fix "read-tree -m A B" priming the cache-tree
1879 diff A...B: give one possible diff when there are more than one merge-base
1881 diff A...B: do not limit the syntax too narrowly
1882 tests: correct "does reflog exist?" tests
1884 Teach "apply --index-info" to handle rename patches
1885 rebase: protect against diff.renames configuration
1889 Fix DIFF_QUEUE_CLEAR refactoring
1890 Documentation: reporting bugs
1891 sha1_name.c: fix parsing of ":/token" syntax
1892 diff --follow: do not waste cycles while recursing
1893 diff --follow: do call diffcore_std() as necessary
1898 Lars R. Damerow (3):
1899 config.c: remove static keyword from git_env_bool()
1900 truncate cwd string before printing error message
1901 Add support for GIT_ONE_FILESYSTEM
1903 Leif Arne Storset (1):
1904 Documentation/config.txt: GIT_NOTES_REWRITE_REF overrides notes.rewriteRef
1907 Make :/ accept a regex rather than a fixed pattern
1908 Fix 'git log' early pager startup error case
1910 Marcus Comstedt (1):
1911 Add "Z" as an alias for the timezone "UTC"
1914 Tell ignore file about generate files in /gitweb/static
1916 Markus Heidelberg (5):
1917 t7508: add test for "git status" refreshing the index
1918 git status: refresh the index if possible
1919 t7508: add a test for "git status" in a read-only repository
1920 Documentation: rebase -i ignores options passed to "git am"
1921 git-gui: fix "Explore Working Copy" for Windows again
1924 Clarify help message when no remote is specified in fetch/pull.
1925 Document ls-files -t as semi-obsolete.
1926 pretty-options.txt: match --format's documentation with implementation.
1927 Document -B<n>[/<m>], -M<n> and -C<n> variants of -B, -M and -C
1928 post-receive-email: remove spurious commas in email subject
1929 push: mention "git pull" in error message for non-fast forwards
1930 xmalloc: include size in the failure message
1931 t0003: add missing && at end of lines
1933 Michael J Gruber (27):
1934 index-pack: fix trivial typo in usage string
1935 t7508: test advice.statusHints
1936 wt-status: take advice.statusHints seriously
1937 for-each-ref: Field with abbreviated objectname
1938 Documentation: fix minor inconsistency
1939 Documentation/gitdiffcore: fix order in pickaxe description
1940 notes: dry-run and verbose options for prune
1941 Documentation/SubmittingPatches: clarify GMail section and SMTP
1942 completion: --set-upstream option for git-branch
1943 Makefile: reenable install with NO_CURL
1944 Documentation/config: describe status.submodulesummary
1945 Documentation: A...B shortcut for checkout and rebase
1946 Documentation+t5708: document and test status -s -b
1947 pretty: Introduce ' ' modifier to add space if non-empty
1948 git-cat-file.txt: Document --textconv
1949 t6018: add tests for rev-list's --branches and --tags
1950 t6018: make sure all tested symbolic names are different revs
1951 git-rev-parse.txt: Document ":path" specifier
1952 git-rev-parse.txt: Add more examples for caret and colon
1953 rerere.txt: Document forget subcommand
1954 Documentation: split off rev doc into include file
1955 Documentation: gitrevisions
1956 Documentation: link to gitrevisions rather than git-rev-parse
1957 t9118: avoid PEG revision identifier in tests
1958 test-lib: simplify GIT_SKIP_TESTS loop
1959 test-lib: TAP compliance for skipping tests on request
1960 Documentation/git-log: Clarify --full-diff
1962 Michael J. Kiwala (1):
1963 git svn: fix empty directory creation
1966 test-lib.sh: Add explicit license detail, with change from GPLv2 to GPLv2+.
1969 format-patch: document the format.to configuration setting
1971 Nathan W. Panike (1):
1972 Add a google-chrome option for web--browse
1975 Documentation/pretty-{formats,options}: better reference for "format:<string>"
1976 commit.h: add 'type' to struct name_decoration
1977 log-tree.c: Use struct name_decoration's type for classifying decoration
1978 log --decorate: Colorize commit decorations
1979 Allow customizable commit decorations colors
1980 Add test for correct coloring of git log --decoration
1981 grep -O: Do not pass color sequences as filenames to pager
1984 index-pack: Don't follow replace refs.
1986 Nguyễn Thái Ngọc Duy (2):
1987 git --paginate: do not commit pager choice too early
1988 git-read-tree.txt: acknowledge the directory matching bug in sparse checkout
1991 Make xmalloc and xrealloc thread-safe
1992 index-pack: smarter memory usage when resolving deltas
1993 index-pack: rationalize unpack_entry_data()
1994 index-pack: smarter memory usage when appending objects
1995 fix >4GiB source delta assertion failure
1997 Nicolas Sebrecht (2):
1998 checkout: accord documentation to what git does
1999 merge-recursive: use "up-to-date" instead of "uptodate" in error message for consistency
2002 git fetch documentation: describe short '-p' synonym to '--prune' option
2005 patch-id: extract parsing one diff out of generate_id_list
2006 patch-id: Add support for mbox format
2009 git-gui: Handle failure of core.worktree to identify the working directory.
2010 git-gui: Avoid using the <<Copy>> binding as a menu accelerator on win32
2011 git-gui: mc cannot be used before msgcat has been loaded
2012 git-gui: fix size and position of window panes on startup
2014 Pavan Kumar Sunkara (7):
2015 gitweb: Use @diff_opts while using format-patch
2016 gitweb: Move static files into seperate subdirectory
2017 gitweb: Set default destination directory for installing gitweb in Makefile
2018 git-instaweb: Put httpd logs in a "$httpd_only" subdirectory
2019 git-instaweb: Configure it to work with new gitweb structure
2020 git-web--browse: Add support for google chrome and chromium
2024 clone: reword messages to match the end-user perception
2026 Peter Collingbourne (4):
2027 Generalise the unlink_or_warn function
2028 Implement the rmdir_or_warn function
2029 Introduce remove_or_warn function
2030 Remove a redundant errno test in a usage of remove_path
2032 Philippe Bruhat (1):
2033 Git.pm: better error message
2035 Pierre Habouzit (1):
2036 fix git branch -m in presence of cross devices
2039 Documentation/git-send-email: Add "Use gmail as the smtp server"
2041 Raja R Harinath (2):
2042 Use dev_t for device id (st_dev) from stat in setup_git_directory_gently()
2043 fast-import: export correctly marks larger than 2^20-1
2046 update-server-info: Shorten read_pack_info_file()
2048 Ralf Wildenhues (1):
2049 Typos in code comments, an error message, documentation
2051 Ramkumar Ramachandra (7):
2052 SubmittingPatches: Add new section about what to base work on
2053 git am: Set cmdline globally
2054 git am: Display some help text when patch is empty
2055 git am: Remove stray error message from sed
2056 Refactor parse_date for approxidate functions
2057 contrib/svn-fe: Fix IncludePath
2058 contrib/svn-fe: Add the svn-fe target to .gitignore
2060 Ramsay Allan Jones (5):
2061 Makefile: Fix 'clean' target to remove all gitweb build files
2062 msvc: Fix some "expr evaluates to function" compiler warnings
2063 msvc: Fix some compiler warnings
2064 msvc: Select the "fast" definition of the {get,put}_be32() macros
2065 notes: Initialise variable to appease gcc
2068 git diff too slow for a file
2069 remove ecb parameter from xdi_diff_outf()
2070 Fix checkout of large files to network shares on Windows XP
2071 grep: add test script for binary file handling
2072 grep: grep: refactor handling of binary mode options
2073 grep: --count over binary
2074 grep: --name-only over binary
2075 grep: use memmem() for fixed string search
2076 grep: continue case insensitive fixed string search after NUL chars
2077 grep: use REG_STARTEND for all matching if available
2078 grep: support NUL chars in search strings for -F
2079 notes: allow --dry-run for -n and --verbose for -v
2080 prune: allow --dry-run for -n and --verbose for -v
2083 mingw_utime(): handle NULL times parameter
2084 rerere: fix overeager gc
2087 gitweb: Add support for FastCGI, using CGI::Fast
2088 git-cvsserver: use a password file cvsserver pserver
2091 Honor "tagopt = --tags" configuration option
2092 remote add: add a --[no-]tags option
2095 Prompt for a username when an HTTP request 401s
2098 git-svn: write memoized data explicitly to avoid Storable bug
2100 Shawn O. Pearce (17):
2101 tag.c: Correct indentation
2102 tag.h: Remove unused signature field
2103 tag.c: Refactor parse_tag_buffer to be saner to program
2104 tag.c: Parse tagger date (if present)
2105 describe: Break annotated tag ties by tagger date
2106 http.c: Remove bad free of static block
2107 t5550-http-fetch: Use subshell for repository operations
2108 http.c: Tiny refactoring of finish_http_pack_request
2109 http.c: Drop useless != NULL test in finish_http_pack_request
2110 http.c: Don't store destination name in request structures
2111 http.c: Remove unnecessary strdup of sha1_to_hex result
2112 Introduce close_pack_index to permit replacement
2113 Extract verify_pack_index for reuse from verify_pack
2114 Allow parse_pack_index on temporary files
2115 http-fetch: Use index-pack rather than verify-pack to check packs
2116 http-fetch: Use temporary files for pack-*.idx until verified
2117 smart-http: Don't deadlock on server failure
2120 branch: exit status now reflects if branch listing finds an error
2121 branch: don't fail listing branches if one of the commits wasn't found
2124 format-patch: Add a signature option (--signature)
2125 completion: Add --signature and format.signature
2126 request-pull.txt: Document -p option
2127 commit: remove full stop from usage help for -u
2130 Add `log.decorate' configuration variable.
2132 Sverre Rabbelier (8):
2133 clone: pass the remote name to remote_get
2134 clone: also configure url for bare clones
2135 fast-import: always create marks_file directories
2136 remote-helpers: allow requesing the path to the .git directory
2137 remote-helpers: add support for an export command
2138 remote-helpers: add testgit helper
2139 remote-helpers: add tests for testgit helper
2140 Gitweb: ignore built file
2143 ls-remote: fall-back to default remotes when no remote specified
2144 t5541-http-push: add test for URLs with trailing slash
2145 http: make end_url_with_slash() public
2146 remote-curl: ensure that URLs have a trailing slash
2147 http.c::new_http_pack_request: do away with the temp variable filename
2148 t7604-merge-custom-message: shift expected output creation
2149 t7604-merge-custom-message: show that --log doesn't append to -m
2150 merge: update comment
2151 merge: rename variable
2152 fmt-merge-msg: minor refactor of fmt_merge_msg()
2153 fmt-merge-msg: refactor merge title formatting
2154 fmt-merge-msg: add function to append shortlog only
2155 merge: --log appends shortlog to message if specified
2156 ls-remote: print URL when no repo is specified
2157 GIT-VERSION-GEN: restrict tags used
2158 t7502-commit: fix spelling
2159 show-branch: use DEFAULT_ABBREV instead of 7
2160 t7502-commit: add tests for summary output
2161 t7502-commit: add summary output tests for empty and merge commits
2162 commit::print_summary(): don't use format_commit_message()
2165 builtin/merge_recursive.c: Add an usage string and make use of it.
2168 diff: add --word-diff option that generalizes --color-words
2169 Complete prototype of git_config_from_parameters()
2170 fast-import: die_nicely() back to vsnprintf (reverts part of ebaa79f)
2171 t/README: document --root option
2172 check_aliased_update: strcpy() instead of strcat() to copy
2173 log_ref_setup: don't return stack-allocated array
2174 rev-list: introduce --count option
2175 parseopt: wrap rev-parse --parseopt usage for eval consumption
2176 send-email: ask about and declare 8bit mails
2177 Only run aggregate-results over actual counts
2178 Documentation/git-reset: reorder modes for soft-mixed-hard progression
2179 Documentation/reset: separate options by mode
2180 Documentation/reset: promote 'examples' one section up
2181 Documentation/reset: reorder examples to match description
2182 Documentation/reset: move "undo permanently" example behind "make topic"
2183 Cast execl*() NULL sentinels to (char *)
2184 Document receive.denyDeleteCurrent
2185 Documentation/git-push: Explain status output in more detail
2186 Fix 'git' wrapper usage string
2187 Makefile: add check-docs exception for gitrevisions
2188 xsize_t: check whether we lose bits
2189 Documentation/rev-parse: quoting is required with --parseopt
2190 t7003: fix subdirectory-filter test
2193 Documentation/SubmittingPatches: Fix typo in GMail section
2196 Change C99 comments to old-style C comments
2198 Torsten Schmutzler (1):
2199 git-svn: mangle refnames forbidden in git
2201 Uwe Kleine-König (1):
2202 rev-parse: fix --parse-opt --keep-dashdash --stop-at-non-option
2205 Documentation: spelling fixes
2208 pretty: make it easier to add new formats
2209 pretty: add infrastructure for commit format aliases
2210 pretty: add aliases for pretty formats
2211 pretty: Respect --abbrev option
2212 diff-options: make --patch a synonym for -p
2213 add basic tests for merge-tree
2214 merge-tree: fix where two branches share no changes
2217 git-rebase: fix typo when parsing --force-rebase
2220 git-mailinfo documentation: clarify -u/--encoding
2223 start_command: close cmd->err descriptor when fork/spawn fails
2225 Ævar Arnfjörð Bjarmason (37):
2226 Add option to git-commit to allow empty log messages
2227 Move t6000lib.sh to lib-*
2228 Turn setup code in t2007-checkout-symlink.sh into a test
2229 git-svn documentation: minor grammar fix
2230 git-svn: Remove unused use of File::Temp
2231 git-cvsserver: authentication support for pserver
2232 git-cvsserver: indent & clean up authdb code
2233 git-cvsserver: Improved error handling for pserver
2234 git-cvsserver: document making a password without htpasswd
2235 git-cvsserver: test for pserver authentication support
2236 git-submodule foreach: Add $toplevel variable
2237 Makefile: remove redundant munging of @@INSTLIBDIR@@
2238 notes: Initialize variable to appease Sun Studio
2239 git-cvsserver: typo in a comment: bas -> has
2240 git-cvsserver: fix error for invalid password formats
2241 test-lib: Adjust output to be valid TAP format
2242 test-lib: Make the test_external_* functions TAP-aware
2243 test-lib: output a newline before "ok" under a TAP harness
2244 tests: Skip tests in a way that makes sense under TAP
2245 tests: Say "pass" rather than "ok" on empty lines for TAP
2246 t9700: Use Test::More->builder, not $Test::Builder::Test
2247 t/README: The trash is in 't/trash directory.$name'
2248 t/README: Typo: paralell -> parallel
2249 t/README: Document the prereq functions, and 3-arg test_*
2250 t/README: Document test_external*
2251 t/README: Document test_expect_code
2252 t/README: Add a section about skipping tests
2253 t/README: Document the do's and don'ts of tests
2254 git submodule: add submodules with git add -f <path>
2255 tests: Use skip_all=* to skip tests
2256 git submodule add: Remove old docs about implicit -f
2257 git add: Add --ignore-missing to SYNOPSIS
2258 test-lib: Ignore --quiet under a TAP harness
2259 test-lib: Remove 3 year old no-op --no-python option
2260 imap-send: Fix sprintf usage
2261 t/lib-git-svn.sh: use $PERL_PATH for perl, not perl from $PATH
2262 log: test for regression introduced in v1.7.2-rc0~103^2~2
2265 Version v1.7.1; changes since v1.7.1-rc1:
2266 -----------------------------------------
2269 Documentation: Describe other situations where -z affects git diff
2272 git-instaweb: pass through invoking user's path to gitweb CGI scripts
2275 Documentation improvements for the description of short format.
2278 Documentation/config.txt: default gc.aggressiveWindow is 250, not 10
2281 diff: use large integers for diffstat calculations
2282 rebase-interactive: silence warning when no commits rewritten
2285 gitk: Add Ctrl-W shortcut for closing the active window
2286 gitk: Display dirty submodules correctly
2288 Johannes Gilger (1):
2289 pretty: Initialize notes if %N is used
2292 Windows: start_command: Support non-NULL dir in struct child_process
2293 MSVC: Fix build by adding missing termios.h dummy
2295 Jonathan Nieder (6):
2296 gitk: Add comments to explain encode_view_opts and decode_view_opts
2297 gitk: Don't clobber "Remember this view" setting
2298 Add .depend directories to .gitignore
2299 Document new "already-merged" rule for branch -d
2300 tag -v: use RUN_GIT_CMD to run verify-tag
2301 Documentation/Makefile: fix interrupted builds of user-manual.xml
2304 SubmittingPatches: update GMail section
2305 blame documentation: -M/-C notice copied lines as well as moved ones
2307 gitweb: simplify gitweb.min.* generation and clean-up rules
2308 t3301: add tests to use --format="%N"
2314 Docs: Add -X option to git-merge's synopsis.
2317 gitk: Remove forced use of sans-serif font
2318 gitk: Set the font for all spinbox widgets
2319 gitk: Set the font for all listbox widgets
2320 gitk: Use consistent font for all text input fields
2322 Matthew Ogilvie (1):
2323 t6006: do not write to /tmp
2325 Michael J Gruber (2):
2326 t1010-mktree: Adjust expected result to code and documentation
2327 t7012: Mark missing tests as TODO
2330 gitk: Avoid calling tk_setPalette on Windows
2331 gitk: Add emacs editor variable block
2332 gitk: Fix display of copyright symbol
2334 Ramkumar Ramachandra (5):
2335 Documentation/remote-helpers: Rewrite description
2336 Documentation/urls: Rewrite to accomodate <transport>::<address>
2337 Documentation/remote-helpers: Add invocation section
2338 Fixup: Second argument may be any arbitrary string
2339 Documentation/remote-helpers: Fix typos and improve language
2342 reflog: remove 'show' from 'expire's usage string
2345 t3507: Make test executable
2348 combined diff: correctly handle truncated file
2351 documentation: clarify direction of core.autocrlf
2354 Version v1.7.1-rc1; changes since v1.7.0.5:
2355 -------------------------------------------
2358 cvsimport: new -R option: generate .git/cvs-revisions mapping
2361 everyday: fsck and gc are not everyday operations
2364 Make templates honour SHELL_PATH and PERL_PATH
2365 Modernize git calling conventions in hook templates
2367 Benjamin C Meyer (1):
2368 Fix a spelling mistake in a git-p4 console message
2371 make union merge an xdl merge favor
2372 refactor merge flags into xmparam_t
2373 merge-file: add option to specify the marker size
2374 merge-file: add option to select union merge favor
2377 t/t1304: avoid -d option to setfacl
2378 t/t1304: set the Default ACL base entries
2379 t/t1304: use 'test -r' to test readability rather than looking at mode bits
2380 t/t1304: set the ACL effective rights mask
2381 t/t1304: make a second colon optional in the mask ACL check
2382 notes.c: remove inappropriate call to return
2383 t5505: remove unnecessary subshell invocations
2384 t5505: add missing &&
2385 t/t5505-remote.sh: escape * to prevent interpretation by shell as glob
2386 notes.h: declare bit field as unsigned to silence compiler complaints
2388 Brian Gernhardt (1):
2389 Use test_expect_success for test setups
2392 imap-send: suppress warning about cleartext password with CRAM-MD5
2394 Christian Couder (8):
2395 reset: add option "--keep" to "git reset"
2396 reset: add test cases for "--keep" option
2397 Documentation: reset: describe new "--keep" option
2398 reset: disallow "reset --keep" outside a work tree
2399 reset: disallow using --keep when there are unmerged entries
2400 cherry-pick: add tests for new --ff option
2401 Documentation: describe new cherry-pick --ff option
2402 rebase -i: use new --ff cherry-pick option
2405 rebase--interactive: don't require what's rebased to be a branch
2408 Makefile: Remove usage of deprecated Python "has_key" method
2411 Makefile: update defaults for modern Cygwin
2414 Integrate version 3 ciabot scripts into contrib/.
2417 hash-object: support --stdin-paths with --no-filters
2418 git-svn: support fetch with autocrlf on
2419 Revert "git-svn: always initialize with core.autocrlf=false"
2420 cherry: support --abbrev option
2421 ls: remove redundant logic
2424 fallback SSH_ASKPASS when GIT_ASKPASS not set
2425 git-svn: Support retrieving passwords with GIT_ASKPASS
2426 git-core: Support retrieving passwords with GIT_ASKPASS
2429 imap-send: support CRAM-MD5 authentication
2431 Ian Ward Comfort (1):
2432 RPM spec: include bash completion support
2434 Ilari Liusvaara (1):
2435 Allow '+', '-' and '.' in remote helper names
2438 gitweb: esc_html (short) error message in die_error
2439 gitweb: Protect escaping functions against calling on undef
2442 git-send-email.perl: improve error message in send_message()
2443 git-send-email.perl: add option --smtp-debug
2444 git-send-email.perl - try to give real name of the calling host to HELO/EHLO
2447 submodule summary: do not shift a non-existent positional variable
2448 fix const-correctness of write_sha1_file
2449 fix textconv leak in emit_rewrite_diff
2450 fix typos and grammar in 1.7.1 draft release notes
2453 git diff --submodule: Show detailed dirty status of submodules
2454 git status: Show detailed dirty status of submodules in long format
2455 git submodule summary: Handle HEAD as argument when on an unborn branch
2456 Refactor dirty submodule detection in diff-lib.c
2457 git status: Fix false positive "new commits" output for dirty submodules
2458 git status: ignoring untracked files must apply to submodules too
2459 Teach diff --submodule and status to handle .git files in submodules
2462 Minor cosmetic fixes to notes.c
2463 Notes API: get_commit_notes() -> format_note() + remove the commit restriction
2464 Add tests for checking correct handling of $GIT_NOTES_REF and core.notesRef
2465 Notes API: init_notes(): Initialize the notes tree from the given notes ref
2466 Notes API: add_note(): Add note objects to the internal notes tree structure
2467 Notes API: remove_note(): Remove note objects from the notes tree structure
2468 Notes API: get_note(): Return the note annotating the given object
2469 Notes API: for_each_note(): Traverse the entire notes tree with a callback
2470 Notes API: write_notes_tree(): Store the notes tree in the database
2471 Notes API: Allow multiple concurrent notes trees with new struct notes_tree
2472 Refactor notes concatenation into a flexible interface for combining notes
2473 Builtin-ify git-notes
2474 t3301: Verify successful annotation of non-commits
2475 t3305: Verify that adding many notes with git-notes triggers increased fanout
2476 Teach notes code to properly preserve non-notes in the notes tree
2477 Teach builtin-notes to remove empty notes
2478 builtin-notes: Add "remove" subcommand for removing existing notes
2479 t3305: Verify that removing notes triggers automatic fanout consolidation
2480 Notes API: prune_notes(): Prune notes that belong to non-existing objects
2481 builtin-notes: Add "prune" subcommand for removing notes for missing objects
2482 Documentation: Generalize git-notes docs to 'objects' instead of 'commits'
2483 builtin-notes: Add "list" subcommand for listing note objects
2484 builtin-notes: Add --message/--file aliases for -m/-F options
2485 builtin-notes: Add "add" subcommand for adding notes to objects
2486 builtin-notes: Add "append" subcommand for appending to note objects
2487 builtin-notes: Deprecate the -m/-F options for "git notes edit"
2488 builtin-notes: Refactor handling of -F option to allow combining -m and -F
2489 builtin-notes: Add -c/-C options for reusing notes
2490 builtin-notes: Misc. refactoring of argc and exit value handling
2491 builtin-notes: Add "copy" subcommand for copying notes between objects
2492 submodule summary: Don't barf when invoked in an empty repo
2493 builtin-notes: Minor (mostly parse_options-related) fixes
2496 Print RUNTIME_PREFIX warning only when GIT_TRACE is set
2497 Windows: redirect f[re]open("/dev/null") to f[re]open("nul")
2499 Jonathan Nieder (34):
2500 Makefile: add missing header file dependencies
2501 Makefile: make sure test helpers are rebuilt when headers change
2502 Makefile: remove wt-status.h from LIB_H
2503 Makefile: clean up http-walker.o dependency rules
2504 Makefile: drop dependency on $(wildcard */*.h)
2505 Makefile: transport.o depends on branch.h now
2506 Makefile: rearrange dependency rules
2507 Makefile: disable default implicit rules
2508 Makefile: list generated object files in OBJECTS
2509 Makefile: lazily compute header dependencies
2510 Makefile: list standalone program object files in PROGRAM_OBJS
2511 Teach Makefile to check header dependencies
2512 Do not install shell libraries executable
2513 Makefile: tuck away generated makefile fragments in .depend
2514 Makefile: always remove .depend directories on 'make clean'
2515 Makefile: clarify definition of TEST_OBJS
2516 Makefile: Fix occasional GIT-CFLAGS breakage
2517 revert: fix tiny memory leak in cherry-pick --ff
2518 tests: document format of conflicts from checkout -m
2519 tests: document cherry-pick behavior in face of conflicts
2520 xdl_merge(): add optional ancestor label to diff3-style output
2521 xdl_merge(): move file1 and file2 labels to xmparam structure
2522 merge-file --diff3: add a label for ancestor
2523 ll_merge(): add ancestor label parameter for diff3-style output
2524 checkout --conflict=diff3: add a label for ancestor
2525 merge_file(): add comment explaining behavior wrt conflict style
2526 merge_trees(): add ancestor label parameter for diff3-style output
2527 checkout -m --conflict=diff3: add a label for ancestor
2528 compat: add mempcpy()
2529 revert: clarify label on conflict hunks
2530 cherry-pick, revert: add a label for ancestor
2531 merge-recursive: add a label for ancestor
2532 Makefile: future-proof Cygwin version check
2533 Teach mailinfo %< as an alternative scissors mark
2535 Junio C Hamano (27):
2536 builtin-for-each-ref.c: comment fixes
2537 builtin-for-each-ref.c: check if we need to peel onion while parsing the format
2538 for-each-ref --format='%(symref) %(symref:short)'
2539 for-each-ref --format='%(flag)'
2541 Resurrect "git grep --no-index"
2542 Update draft release notes to 1.7.1
2543 notes: fix malformed tree entry
2544 wrap-for-bin: do not export an empty GIT_TEMPLATE_DIR
2545 submodule summary: do not fail before the first commit
2546 parse-options: add parse_options_concat() to concat options
2547 builtin/merge: make checkout_fast_forward() non static
2548 revert: add --ff option to allow fast forward when cherry-picking
2549 Update draft release notes to 1.7.1
2550 Documentation: improve description of "git reset --keep"
2551 t4013: add tests for log -p -m --first-parent
2552 revision: introduce setup_revision_opt
2553 show -c: show patch text
2554 show --first-parent/-m: do not default to --cc
2555 Makefile: update check-docs target
2556 t5516: Use test_cmp when appropriate
2557 Update draft release notes to 1.7.1
2558 Update draft release notes to 1.7.1
2559 Revert "Link against libiconv on IRIX"
2561 diff.c: work around pointer constness warnings
2565 git-push: fix an advice message so it goes to stderr
2566 git-push: send "To <remoteurl>" messages to the standard output in --porcelain mode
2567 git-push: make git push --porcelain print "Done"
2568 git-push: add tests for git push --porcelain
2571 Move 'builtin-*' into a 'builtin/' subdirectory
2574 Teach rebase the --no-ff option.
2577 Add an optional argument for --color options
2578 Add GIT_COLOR_BOLD_* and GIT_COLOR_BG_*
2579 grep: Colorize filename, line number, and separator
2580 grep: Colorize selected, context, and function lines
2583 Gitweb: add ignore and clean rules for minified files
2584 Gitweb: add support for minifying gitweb.css
2585 Gitweb: add autoconfigure support for minifiers
2586 instaweb: add minification awareness
2587 gitweb: add documentation to INSTALL regarding gitweb.js
2588 gitweb: update INSTALL to use shorter make target
2590 Markus Heidelberg (2):
2591 builtin/commit: fix duplicated sentence in a comment
2592 builtin/commit: remove unnecessary variable definition
2594 Michael J Gruber (7):
2595 git-svn: req_svn when needed
2596 t9119-git-svn-info.sh: test with svn 1.6.* as well
2597 Documentation: fix a few typos in git-notes.txt
2598 git-svn: make git svn --version work again
2599 rev-list: use default abbrev length when abbrev-commit is in effect
2600 t3301-notes: Test the creation of reflog entries
2601 refs.c: Write reflogs for notes just like for branch heads
2603 Michael Lukashov (4):
2604 connect.c: move duplicated code to a new function 'get_host_and_port'
2605 refactor duplicated code in builtin-send-pack.c and transport.c
2606 refactor duplicated fill_mm() in checkout and merge-recursive
2607 refactor duplicated encode_header in pack-objects and fast-import
2609 Michele Ballabio (1):
2610 shortlog: warn the user when there is no input
2613 request-pull: avoid mentioning that the start point is a single commit
2615 Nguyễn Thái Ngọc Duy (5):
2616 make_absolute_path(): Do not append redundant slash
2617 init-db, rev-parse --git-dir: do not append redundant slash
2618 Move offset_1st_component() to path.c
2619 Support working directory located at root
2620 Add test for using Git at root of file system
2623 move encode_in_pack_object_header() to a better place
2626 git log -p -m: document -m and honor --first-parent
2629 setenv(GIT_DIR) clean-up
2630 grep: enable threading for context line printing
2633 bash: improve aliased command recognition
2634 bash: support user-supplied completion scripts for user's git commands
2635 bash: support user-supplied completion scripts for aliases
2636 bash: completion for gitk aliases
2639 documentation: 'git-mailsplit --keep-cr' is not hidden anymore
2640 git-am: Add command line parameter `--keep-cr` passing it to git-mailsplit
2641 git-am: Add am.keepcr and --no-keep-cr to override it
2642 git-am: Add tests for `--keep-cr`, `--no-keep-cr` and `am.keepcr`
2645 format-patch: use a string_list for headers
2646 format-patch: add --no-cc, --no-to, and --no-add-headers
2647 send-email: add --no-cc, --no-to, and --no-bcc
2648 notes: rework subcommands and parse options
2649 fmt-merge-msg: be quiet if nothing to merge
2650 t6200: modernize with test_tick
2651 t6200: test fmt-merge-msg more
2652 fmt-merge-msg: use pretty.c routines
2653 string-list: add unsorted_string_list_lookup()
2654 fmt-merge-msg: remove custom string_list implementation
2655 fmt-merge-msg: hide summary option
2658 Add `init.templatedir` configuration variable.
2659 Add a "TEMPLATE DIRECTORY" section to git-init[1].
2660 init: having keywords without value is not a global error.
2661 t/t0001-init.sh: add test for 'init with init.templatedir set'
2662 Add 'git format-patch --to=' option and 'format.to' configuration variable.
2665 Documentation/git-clone: mention progress in -v
2666 Documentation/git-pull: put verbosity options before merge/fetch ones
2667 Documentation/git-push: put --quiet before --verbose
2668 fetch: refactor verbosity option handling into transport.[ch]
2669 push: support multiple levels of verbosity
2670 clone: support multiple levels of verbosity
2671 transport->progress: use flag authoritatively
2672 push: learn --progress
2673 fetch and pull: learn --progress
2674 transport: update flags to be in running order
2675 t5541-http-push: check that ref is unchanged for non-ff test
2676 t554[01]-http-push: refactor, add non-ff tests
2677 http-push: remove "|| 1" to enable verbose check
2678 http-walker: cleanup more thoroughly
2679 http: init and cleanup separately from http-walker
2680 remote-curl: use http_fetch_ref() instead of walker wrapper
2681 remote-curl: init walker only when needed
2684 test-lib: unset GIT_NOTES_REF to stop it from influencing tests
2685 Support showing notes from more than one notes tree
2686 Documentation: document post-rewrite hook
2687 commit --amend: invoke post-rewrite hook
2688 rebase: invoke post-rewrite hook
2689 rebase -i: invoke post-rewrite hook
2690 notes: implement 'git notes copy --stdin'
2691 notes: implement helpers needed for note copying during rewrite
2692 rebase: support automatic notes copying
2693 commit --amend: copy notes to the new commit
2694 notes: add shorthand --ref to override GIT_NOTES_REF
2695 notes: track whether notes_trees were changed at all
2696 git-notes(1): add a section about the meaning of history
2697 rebase -i: make post-rewrite work for 'edit'
2700 t9151: Fix a few commits in the SVN dump
2701 t9151: Add two new svn:mergeinfo test cases
2702 git-svn: Fix discarding of extra parents from svn:mergeinfo
2703 git-svn: Fix merge detecting with rewrite-root
2704 t9150,t9151: Add rewrite-root option to init
2706 YONETANI Tomokazu (1):
2707 Fix _XOPEN_SOURCE problem on DragonFly
2710 git svn: delay importing SVN::Base until it is needed
2713 Version v1.7.0.5; changes since v1.7.0.4:
2714 -----------------------------------------
2717 daemon.c: avoid accessing ss_family member of struct sockaddr_storage
2720 rev-list: fix --pretty=oneline with empty message
2723 Improve error messages from 'git stash show'
2726 docs: clarify "branch -l"
2729 Let check_preimage() use memset() to initialize "struct checkout"
2732 diff --check: honor conflict-marker-size attribute
2733 blame documentation: -M/-C notice copied lines as well as moved ones
2736 Michael J Gruber (2):
2737 .mailmap: Entries for Alex Bennée, Deskin Miller, Vitaly "_Vi" Shukela
2738 send-email: lazily assign editor variable
2740 R. Tyler Ballance (1):
2741 Correct references to /usr/bin/python which does not exist on FreeBSD
2743 Ramkumar Ramachandra (1):
2744 imap-send: Remove limitation on message body
2746 Shawn O. Pearce (1):
2747 http-backend: Don't infinite loop during die()
2750 pack-protocol.txt: fix spelling
2751 pack-protocol.txt: fix pkt-line lengths
2752 branch: say "Reset to" in reflog entries for 'git branch -f' operations
2753 fetch/push: fix usage strings
2756 Version v1.7.0.4; changes since v1.7.0.3:
2757 -----------------------------------------
2759 Björn Gustavsson (5):
2760 apply: Don't unnecessarily update line lengths in the preimage
2761 apply: Remove the quick rejection test
2762 apply: Allow blank context lines to match beyond EOF
2763 t4124: Add additional tests of --whitespace=fix
2764 t3417: Add test cases for "rebase --whitespace=fix"
2767 test for add with non-existent pathspec
2770 difftool: Fix '--gui' when diff.guitool is unconfigured
2773 Documentation: Clarify support for smart HTTP backend
2776 Don't redefine htonl and ntohl on big-endian
2777 Link against libiconv on IRIX
2778 Documentation: show-ref <pattern>s are optional
2781 gitweb: git_get_project_config requires only $git_dir, not also $project
2784 Updated the usage string of git reset
2787 dir: fix COLLECT_IGNORED on excluded prefixes
2790 diff: fix textconv error zombies
2791 Windows: fix utime() for read-only files
2794 git add -u: die on unmatched pathspec
2795 color: allow multiple attributes
2796 t0050: mark non-working test as such
2797 tests for "git add ignored-dir/file" without -f
2798 refs: ref entry with NULL sha1 is can be a dangling symref
2799 t9350: fix careless use of "cd"
2804 format-patch: Squelch 'fatal: Not a range." error
2806 Markus Heidelberg (1):
2807 Documentation: explain the meaning of "-g" in git-describe output
2809 Sverre Rabbelier (1):
2810 fast-export: don't segfault when marks file cannot be opened
2813 Version v1.7.0.3; changes since v1.7.0.2:
2814 -----------------------------------------
2817 prune: honor --expire=never
2818 reflog: honor gc.reflogexpire=never
2820 Andreas Gruenbacher (3):
2821 fetch: Check for a "^{}" suffix with suffixcmp()
2822 fetch: Future-proof initialization of a refspec on stack
2823 fetch: Fix minor memory leak
2826 don't use default revision if a rev was specified
2828 Filippo Negroni (1):
2829 Fix gitmkdtemp: correct test for mktemp() return value
2831 Giuseppe Bilotta (5):
2832 Refactor list of of repo-local env vars
2833 rev-parse: --local-env-vars option
2834 shell setup: clear_local_git_env() function
2835 submodules: ensure clean environment when operating in a submodule
2836 is_submodule_modified(): clear environment properly
2838 Ian Ward Comfort (1):
2839 bash: complete *_HEAD refs if present
2842 daemon: parse_host_and_port SIGSEGV if port is specified
2845 add-interactive: fix bogus diff header line ordering
2846 push: fix segfault for odd config
2848 Jonathan Nieder (1):
2849 Makefile: Fix CDPATH problem
2851 Junio C Hamano (12):
2852 "log --author=me --grep=it" should find intersection, not union
2853 Reword "detached HEAD" notification
2854 mailinfo: do not strip leading spaces even for a header line
2855 t5521: fix and modernize
2856 builtin-fetch --all/--multi: propagate options correctly
2857 fetch --all/--multiple: keep all the fetched branch information
2858 pack-objects documentation: reword "objects that appear in the standard input"
2859 Merge accumulated fixes to prepare for 1.7.0.3
2860 t9400: Use test_cmp when appropriate
2861 t/Makefile: remove test artifacts upon "make clean"
2862 Update draft release notes to 1.7.0.3
2866 grep docs: pluralize "Example" section
2867 grep docs: use AsciiDoc literals consistently
2868 grep docs: --cached and <tree>... are incompatible
2869 grep docs: document --no-index option
2872 Add a testcase for ACL with restrictive umask.
2873 Move gitmkstemps to path.c
2874 git_mkstemp_mode, xmkstemp_mode: variants of gitmkstemps with mode argument.
2875 Use git_mkstemp_mode and xmkstemp_mode in odb_mkstemp, not chmod later.
2876 git_mkstemps_mode: don't set errno to EINVAL on exit.
2877 Use git_mkstemp_mode instead of plain mkstemp to create object files
2879 Michael J Gruber (7):
2880 Documentation/git-read-tree: fix table layout
2881 Documentation/git-read-tree: clarify 2-tree merge
2882 Documentation/git-reflog: Fix formatting of command lists
2883 Documentation/gitdiffcore: Remove misleading date in heading
2884 Documentation/urls: Remove spurious example markers
2885 Documentation/git-clone: Transform description list into item list
2886 .mailmap: Map the the first submissions of MJG by e-mail
2889 run-command.c: fix build warnings on Ubuntu
2892 Documentation: pack-objects: Clarify --local's semantics.
2893 pack-objects documentation: Fix --honor-pack-keep as well.
2896 blame: fix indent of line numbers
2897 for_each_recent_reflog_ent(): use strbuf, fix offset handling
2900 pull: replace unnecessary sed invocation
2903 Documentation: receive.denyCurrentBranch defaults to 'refuse'
2906 Version v1.7.0.2; changes since v1.7.0:
2907 ---------------------------------------
2910 Documentation: mention conflict marker size argument (%L) for merge driver
2911 rerere: fix memory leak if rerere images can't be read
2912 unset GREP_OPTIONS in test-lib.sh
2914 Christian Couder (1):
2915 bisect: error out when passing bad path parameters
2918 hash-object: don't use mmap() for small files
2921 run-command: support custom fd-set in async
2924 git-p4: fix bug in symlink handling
2927 require_work_tree broken with NONGIT_OK
2930 git-imap-send: Convert LF to CRLF before storing patch to draft box
2933 Documentation: Fix indentation problem in git-commit(1)
2936 gitweb: Die if there are parsing errors in config file
2937 gitweb: Fix project-specific feature override behavior
2940 accept "git grep -- pattern"
2941 cherry-pick: rewrap advice message
2942 cherry-pick: refactor commit parsing code
2943 cherry-pick: format help message as strbuf
2944 cherry-pick: show commit name instead of sha1
2945 cherry-pick: prettify the advice message
2946 dwim_ref: fix dangling symref warning
2947 docs: don't talk about $GIT_DIR/refs/ everywhere
2948 rm: fix bug in recursive subdirectory removal
2951 t3301-notes: insert a shbang line in ./fake_editor.sh
2953 Jonathan Nieder (9):
2954 Fix 'git var' usage synopsis
2955 Make 'git var GIT_PAGER' always print the configured pager
2956 git.1: Clarify the behavior of the --paginate option
2957 git svn: Fix launching of pager
2958 am: Fix launching of pager
2959 tests: Add tests for automatic use of pager
2960 t7006-pager: if stdout is not a terminal, make a new one
2961 tests: Fix race condition in t7006-pager
2962 am: remove rebase-apply directory before gc
2964 Junio C Hamano (12):
2965 t6000lib: Fix permission
2966 lib-patch-mode.sh: Fix permission
2967 Typofixes outside documentation area
2968 Start 1.7.0 maintenance track
2969 Fix use of mutex in threaded grep
2970 Prepare 1.7.0.1 release notes
2971 status: preload index to optimize lstat(2) calls
2972 Update 1.7.0.1 release notes
2974 Start preparing for 1.7.0.2
2975 Update draft release notes to 1.7.0.2
2979 diff: make sure --output=/bad/path is caught
2980 git diff --quiet -w: check and report the status
2981 git-diff: add a test for git diff --quiet -w
2984 grep documentation: clarify what files match
2985 Remove reference to GREP_COLORS from documentation
2987 Markus Heidelberg (1):
2988 sha1_name: fix segfault caused by invalid index access
2991 commit: quote the user name in the example
2994 stash: suggest the correct command line for unknown options.
2997 Remove extra '-' from git-am(1)
3000 fast-import: start using struct pack_idx_entry
3001 fast-import: use sha1write() for pack data
3002 fast-import: use write_idx_file() instead of custom code
3003 fast-import: make default pack size unlimited
3004 fast-import: honor pack.indexversion and pack.packsizelimit config vars
3005 fast-import: use the diff_delta() max_delta_size argument
3006 sha1_file: don't malloc the whole compressed result when writing out objects
3007 sha1_file: be paranoid when creating loose objects
3010 Remove hyphen from "git-command" in two error messages
3013 fix minor memory leak in get_tree_entry()
3014 utf8.c: remove print_wrapped_text()
3015 utf8.c: remove print_spaces()
3016 utf8.c: remove strbuf_write()
3017 utf8.c: speculatively assume utf-8 in strbuf_add_wrapped_text()
3019 Shawn O. Pearce (7):
3020 run-command: Allow stderr to be a caller supplied pipe
3021 send-pack: demultiplex a sideband stream with status data
3022 receive-pack: Refactor how capabilities are shown to the client
3023 receive-pack: Wrap status reports inside side-band-64k
3024 receive-pack: Send hook output over side band #2
3025 t5401: Use a bare repository for the remote peer
3026 receive-pack: Send internal errors over side-band #2
3029 Documentation: describe --thin more accurately
3030 t7406: Fix submodule init config tests
3033 gitweb multiple project roots documentation
3036 transport: add got_remote_refs flag
3039 stash pop: remove 'apply' options during 'drop' invocation
3040 t1450: fix testcases that were wrongly expecting failure
3041 cherry_pick_list: quit early if one side is empty
3044 Version v1.7.0; changes since v1.7.0-rc2:
3045 -----------------------------------------
3047 Brian Gernhardt (1):
3048 t3902: Protect against OS X normalization
3051 filter-branch: Fix error message for --prune-empty --commit-filter
3054 blame: prevent a segv when -L given start > EOF
3057 am: switch --resolved to --continue
3059 Junio C Hamano (11):
3060 git-add documentation: Fix shell quoting example
3061 Fix parsing of imap.preformattedHTML and imap.sslverify
3062 git-push: document all the status flags used in the output
3063 check-ref-format documentation: fix enumeration mark-up
3064 t8003: check exit code of command and error message separately
3066 Update draft release notes to 1.7.0 one more time
3067 archive documentation: attributes are taken from the tree by default
3068 Re-fix check-ref-format documentation mark-up
3069 Fix typo in 1.6.6.2 release notes
3072 Michael J Gruber (1):
3073 Documentation: minor fixes to RelNotes-1.7.0
3076 Revert "pack-objects: fix pack generation when using pack_size_limit"
3079 bash: support 'git am's new '--continue' option
3082 Documentation: quote braces in {upstream} notation
3085 Version v1.7.0-rc2; changes since v1.7.0-rc1:
3086 ---------------------------------------------
3089 git-svn: persistent memoization
3092 configure: Allow GIT_ARG_SET_PATH to handle --without-PROGRAM
3093 configure: Allow --without-python
3095 Björn Gustavsson (1):
3096 bash: support the --autosquash option for rebase
3098 Brian Gernhardt (2):
3099 t9501: Skip testing load if we can't detect it
3100 t9501: Re-fix max load test
3102 Christian Stimming (1):
3103 git-gui: Update German translation (12 new or changed strings).
3106 Make NO_PTHREADS the sole thread configuration variable
3108 Emmanuel Trillaud (1):
3109 git-gui: update french translation
3111 Giuseppe Bilotta (4):
3112 git-gui: handle non-standard worktree locations
3113 git-gui: handle bare repos correctly
3114 git-gui: update shortcut tools to use _gitworktree
3115 git-gui: set GIT_DIR and GIT_WORK_TREE after setup
3118 git-gui: fix shortcut for menu "Commit/Revert Changes"
3121 gitweb: Make running t9501 test with '--debug' reliable and usable
3124 git-gui: Support applying a range of changes at once
3127 mention new shell execution behavior in release notes
3128 docs: fix filter-branch example for quoted paths
3129 Fix invalid read in quote_c_style_counted
3132 git-gui: Use git diff --submodule when available
3133 git-gui: Add a special diff popup menu for submodules
3134 git-gui: Quote git path when starting another gui in a submodule
3135 Fix memory leak in submodule.c
3136 Updates for dirty submodules in release notes and user manual
3138 John 'Warthog9' Hawley (7):
3139 gitweb: Load checking
3140 gitweb: Makefile improvements
3141 gitweb: Check that $site_header etc. are defined before using them
3142 gitweb: add a "string" variant of print_local_time
3143 gitweb: add a "string" variant of print_sort_th
3144 gitweb: Add optional extra parameter to die_error, for extended explanation
3145 gitweb: Simplify (and fix) chop_str
3148 RPM packaging: use %global inside %{!?...}
3149 Update draft release notes to 1.7.0
3150 build: make code "-Wpointer-arith" clean
3151 fast-import.c: Fix big-file-threshold parsing bug
3152 fast-import: count --max-pack-size in bytes
3153 Revert 30816237 and 7e62265
3154 Update draft release notes to 1.7.0
3156 Michael J Gruber (1):
3157 git-clean: fix the description of the default behavior
3160 filter-branch: Fix to allow replacing submodules with another content
3161 filter-branch: Add tests for submodules in tree-filter
3163 Michele Ballabio (1):
3164 git-gui: update Italian translation
3166 Nanako Shiraishi (1):
3167 git-gui: update Japanese translation
3170 fix multiple issues with t5300
3171 pack-objects: fix pack generation when using pack_size_limit
3172 make --max-pack-size argument to 'git pack-object' count in bytes
3173 update git-repack documentation wrt repack.UseDeltaBaseOffset
3175 Pal-Kristian Engstad (1):
3176 git-p4: Fix sync errors due to new server version
3179 git-gui: use themed tk widgets with Tk 8.5
3182 gitk: Fix copyright symbol in About box message
3185 git-gui: Update Swedish translation (520t0f0u)
3187 Peter Oberndorfer (1):
3188 git-gui: use different icon for new and modified files in the index
3190 Ralf Wildenhues (1):
3191 Fix typos in technical documentation.
3194 grep: simplify assignment of ->fixed
3195 archive: simplify archive format guessing
3197 Shawn O. Pearce (4):
3198 git-gui: Remove unused icon file_parttick
3199 git-gui: Update translation template
3200 fast-import: Stream very large blobs directly to pack
3201 Correct spelling of 'REUC' extension
3203 Wesley J. Landaker (1):
3204 Update git fsck --full short description to mention packs
3207 Version v1.7.0-rc1; changes since v1.6.6.2:
3208 -------------------------------------------
3210 Alejandro Riveira Fernández (1):
3211 Add test-run-command to .gitignore
3213 Andreas Gruenbacher (2):
3214 builtin-apply.c: Skip filenames without enough components
3215 builtin-apply.c: fix the --- and +++ header filename consistency check
3218 git-svn: ignore changeless commits when checking for a cherry-pick
3219 git-svn: handle merge-base failures
3220 git-svn: update svn mergeinfo test suite
3222 Andrzej K. Haczewski (1):
3223 MSVC: Windows-native implementation for subset of Pthreads API
3226 git merge -X<option>
3227 Teach git-pull to pass -X<option> to git-merge
3228 Extend merge-subtree tests to test -Xsubtree=dir.
3230 Bart Trojanowski (1):
3231 hg-to-git: fix COMMITTER type-o
3234 cvsimport: modernize callouts to git subcommands
3235 cvsimport: standarize open() calls to external git tools
3236 cvsimport: standarize system() calls to external git tools
3238 Benjamin Kramer (1):
3239 grep: use REG_STARTEND (if available) to speed up regexec
3242 Test update-index for a gitlink to a .git file
3243 Handle relative paths in submodule .git files
3245 Christian Couder (9):
3246 gitk: Add "--no-replace-objects" option
3247 reset: improve mixed reset error message when in a bare repo
3248 Documentation: reset: add some tables to describe the different options
3249 reset: add a few tests for "git reset --merge"
3250 Documentation: reset: add some missing tables
3251 t7111: check that reset options work as described in the tables
3252 help: fix configured help format taking over command line one
3253 t7111: fix bad HEAD in tests with unmerged entries
3254 Documentation: rev-list: fix synopsys for --tags and and --remotes
3256 Christian Stimming (1):
3257 gitk: Update German translation
3260 grep: Fix two memory leaks
3262 Daniel Barkalow (9):
3263 Fix memory leak in helper method for disconnect
3264 Allow programs to not depend on remotes having urls
3265 Use a function to determine whether a remote is valid
3266 Allow fetch to modify refs
3267 Add a config option for remotes to specify a foreign vcs
3268 Add support for "import" helper command
3269 Allow helper to map private ref names into normal names
3270 Allow helpers to report in "list" command that the ref is unchanged
3271 Replace parse_blob() with an explanatory comment
3274 gitk: Enable gitk to create tags with messages
3275 gitk: Fix display of newly-created tags
3278 t7800-difftool: Set a bogus tool for use by tests
3279 git-difftool: Add '--gui' for selecting a GUI tool
3280 difftool--helper: Update copyright and remove distracting comments
3281 difftool--helper: Remove use of the GIT_MERGE_TOOL variable
3282 difftool: Allow specifying unconfigured commands with --extcmd
3283 git-diff.txt: Link to git-difftool
3284 t7800-difftool.sh: Simplify the --extcmd test
3285 difftool: Add '-x' and as an alias for '--extcmd'
3286 difftool: Use eval to expand '--extcmd' expressions
3287 difftool: Update copyright notices to list each year separately
3288 t7800-difftool.sh: Test mergetool.prompt fallback
3290 Emmanuel Trillaud (1):
3291 gitk: Add French translation
3294 daemon: consider only address in kill_some_child()
3295 Windows: disable Python
3297 Felipe Contreras (1):
3298 General --quiet improvements
3300 Fredrik Kuivinen (1):
3304 No diff -b/-w output for all-whitespace changes
3306 Horst H. von Brand (1):
3307 git-rebase.txt: Fix spelling
3310 git-svn: fix mismatched src/dst errors for branch/tag
3311 git-svn: respect commiturl option for branch/tag
3312 git-svn: add --username/commit-url options for branch/tag
3313 git-svn: document --username/commit-url for branch/tag
3315 Ilari Liusvaara (18):
3316 Add remote helper debug mode
3317 Support mandatory capabilities
3318 Pass unknown protocols to external protocol handlers
3319 Refactor git transport options parsing
3320 Support taking over transports
3321 Support remote helpers implementing smart transports
3322 Support remote archive from all smart transports
3323 Remove special casing of http, https and ftp
3324 Reset possible helper before reusing remote structure
3325 Improve error message when a transport helper was not found
3326 Add push --set-upstream
3327 Add git remote set-url
3328 Add branch --set-upstream
3330 rev-parse --branches/--tags/--remotes=pattern
3331 Support addresses with ':' in git-daemon
3332 Allow use of []-wrapped addresses in git://
3333 Fix remote.<remote>.vcs
3336 gitweb.js: Workaround for IE8 bug
3338 James P. Howard, II (1):
3339 commit: support commit.status, --status, and --no-status
3342 builtin-push: add --delete as syntactic sugar for :foo
3345 git-svn: allow UUID to be manually remapped via rewriteUUID
3346 git-svn: allow subset of branches/tags to be specified in glob spec
3349 status: typo fix in usage
3350 status: refactor short-mode printing to its own function
3351 status: refactor format option parsing
3352 status: add --porcelain output format
3353 commit: support alternate status formats
3354 docs: note that status configuration affects only long format
3355 tests: rename duplicate t1009
3356 status: disable color for porcelain format
3357 status: reduce duplicated setup code
3358 tests: handle NO_PYTHON setting
3359 run-command: add "use shell" option
3360 run-command: convert simple callsites to use_shell
3361 run-command: optimize out useless shell calls
3362 editor: use run_command's shell feature
3363 textconv: use shell to run helper
3364 diff: run external diff helper with shell
3365 strbuf_expand: convert "%%" to "%"
3366 strbuf: add strbuf_addbuf_percentquote
3367 commit: show interesting ident information in summary
3368 commit: allow suppression of implicit identity advice
3369 t0101: use absolute date
3370 rerere: fix too-short initialization
3371 test combinations of @{} syntax
3372 fix parsing of @{-1}@{u} combination
3373 reject @{-1} not at beginning of object name
3374 fix off-by-one allocation error
3375 add shebang line to git-mergetool--lib.sh
3378 Show submodules as modified when they contain a dirty work tree
3379 git status: Show uncommitted submodule changes too when enabled
3380 Performance optimization for detection of modified submodules
3381 git diff: Don't test submodule dirtiness with --ignore-submodules
3382 Teach diff --submodule that modified submodule directory is dirty
3385 diff.c: fix typoes in comments
3388 Basic build infrastructure for Python scripts
3389 fast-import: Proper notes tree manipulation
3390 Rename t9301 to t9350, to make room for more fast-import tests
3391 Add more testcases to test fast-import of notes
3393 Johannes Schindelin (2):
3394 Allow specifying the remote helper in the url
3395 Introduce <branch>@{upstream} notation
3398 Make test case number unique
3399 filter-branch: remove an unnecessary use of 'git read-tree'
3400 t0021: use $SHELL_PATH for the filter script
3401 t4030, t4031: work around bogus MSYS bash path conversion
3402 start_command: report child process setup errors to the parent's stderr
3403 run-command: move wait_or_whine earlier
3404 start_command: detect execvp failures early
3405 Windows: boost startup by avoiding a static dependency on shell32.dll
3406 Windows: simplify the pipe(2) implementation
3407 Windows: avoid the "dup dance" when spawning a child process
3408 Do not use date.c:tm_to_time_t() from compat/mingw.c
3409 Makefile: honor NO_CURL when setting REMOTE_CURL_* variables
3410 Make test case numbers unique
3411 Make 'rerere forget' work from a subdirectory.
3412 merge-tree: remove unnecessary call of git_extract_argv0_path
3413 Make test numbers unique
3414 git_connect: use use_shell instead of explicit "sh", "-c"
3415 Implement pthread_cond_broadcast on Windows
3417 Jonathan Nieder (15):
3418 Makefile: make ppc/sha1ppc.o depend on GIT-CFLAGS
3419 Makefile: regenerate assembler listings when asked
3420 Makefile: use target-specific variable to pass flags to cc
3421 Makefile: learn to generate listings for targets requiring special flags
3422 Makefile: consolidate .FORCE-* targets
3423 Documentation: git gc packs refs by default now
3424 Documentation: tiny git config manual tweaks
3425 Documentation: merge: move configuration section to end
3426 Documentation: suggest `reset --merge` in How Merge Works section
3427 Documentation: merge: move merge strategy list to end
3428 Documentation: merge: add an overview
3429 Documentation: emphasize when git merge terminates early
3430 Documentation: merge: add a section about fast-forward
3431 Documentation: simplify How Merge Works
3432 Documentation: merge: use MERGE_HEAD to refer to the remote branch
3434 Junio C Hamano (106):
3435 Refuse updating the current branch in a non-bare repository via push
3436 Refuse deleting the current branch via push
3437 diff: change semantics of "ignore whitespace" options
3438 diff: Rename QUIET internal option to QUICK
3439 git stat: the beginning of "status that is not a dry-run of commit"
3440 git stat -s: short status output
3441 git status: not "commit --dry-run" anymore
3442 send-email: make --no-chain-reply-to the default
3443 "checkout A...B" switches to the merge base between A and B
3444 "rebase --onto A...B" replays history on the merge base between A and B
3445 git-merge-file --ours, --theirs
3446 Teach --[no-]rerere-autoupdate option to merge, revert and friends
3447 commit/status: check $GIT_DIR/MERGE_HEAD only once
3448 commit/status: "git add <path>" is not necessarily how to resolve
3449 status/commit: do not suggest "reset HEAD <path>" while merging
3450 builtin-merge.c: use standard active_cache macros
3451 resolve-undo: record resolved conflicts in a new index extension section
3452 resolve-undo: basic tests
3453 resolve-undo: allow plumbing to clear the information
3454 resolve-undo: "checkout -m path" uses resolve-undo information
3455 resolve-undo: teach "update-index --unresolve" to use resolve-undo info
3456 rerere: remove silly 1024-byte line limit
3457 Kick off 1.7.0 cycle
3459 branch -d: base the "already-merged" safety on the branch it merges with
3460 "reset --merge": fix unmerged case
3461 tests: move convenience regexp to match object names to test-lib.sh
3462 more D/F conflict tests
3463 traverse_trees(): handle D/F conflict case sanely
3464 Aggressive three-way merge: fix D/F case
3465 Fix bit assignment for CE_CONFLICTED
3466 .gitattributes: detect 8-space indent in shell scripts
3467 unpack-trees.c: prepare for looking ahead in the index
3468 unpack-trees.c: look ahead in the index
3469 read-tree --debug-unpack
3470 Describe second batch for 1.7.0 in draft release notes
3471 ident.c: remove unused variables
3472 t3001: test ls-files -o ignored/dir
3473 read_directory_recursive(): refactor handling of a single path into a separate function
3474 read_directory(): further split treat_path()
3475 ls-files: fix overeager pathspec optimization
3476 ident.c: check explicit identity for name and email separately
3477 ident.c: treat $EMAIL as giving user.email identity explicitly
3478 rerere: refactor rerere logic to make it independent from I/O
3479 rerere forget path: forget recorded resolution
3480 bisect.c: mark file-local function static
3481 builtin-rev-list.c: mark file-local function static
3482 pretty.c: mark file-local function static
3483 grep: optimize built-in grep by skipping lines that do not hit
3484 http.c: mark file-local functions static
3485 entry.c: mark file-local function static
3486 parse-options.c: mark file-local function static
3487 read-cache.c: mark file-local functions static
3488 remote-curl.c: mark file-local function static
3489 quote.c: mark file-local function static
3490 submodule.c: mark file-local function static
3491 utf8.c: mark file-local function static
3492 mailmap.c: remove unused function
3493 sha1_file.c: remove unused function
3494 strbuf.c: remove unused function
3495 grep: rip out support for external grep
3496 grep: rip out pessimization to use fixmatch()
3497 t7502: test commit.status, --status and --no-status
3498 strbuf_addbuf(): allow passing the same buf to dst and src
3499 grep: prepare to run outside of a work tree
3500 grep --no-index: allow use of "git grep" outside a git repository
3501 Teach diff that modified submodule directory is dirty
3502 git_attr(): fix function signature
3503 xdl_merge(): introduce xmparam_t for merge specific parameters
3504 xdl_merge(): allow passing down marker_size in xmparam_t
3505 merge-tree: use ll_merge() not xdl_merge()
3506 rerere: use ll_merge() instead of using xdl_merge()
3507 conflict-marker-size: new attribute
3508 commit.c::print_summary: do not release the format string too early
3509 rerere: prepare for customizable conflict marker length
3510 rerere: honor conflict-marker-size attribute
3511 user_ident_sufficiently_given(): refactor the logic to be usable from elsewhere
3512 user_ident_sufficiently_given(): refactor the logic to be usable from elsewhere
3513 Update COPYING with GPLv2 with new FSF address
3514 Update draft release notes to 1.7.0
3515 pull: Fix parsing of -X<option>
3516 Make "subtree" part more orthogonal to the rest of merge-recursive.
3517 Document that merge strategies can now take their own options
3518 object.c: remove unused functions
3519 symlinks.c: remove unused functions
3520 Update draft release notes to 1.7.0
3521 Fix "checkout A..." synonym for "checkout A...HEAD" on Windows
3522 t1506: more test for @{upstream} syntax
3523 Teach @{upstream} syntax to strbuf_branchanme()
3524 date.c: mark file-local function static
3525 Update draft release notes to 1.7.0
3526 conflict-marker-size: add test and docs
3527 git-mv: fix moving more than one source to a single destination
3528 Update draft release notes to 1.7.0
3529 rebase -i: Export GIT_AUTHOR_* variables explicitly
3530 Make ce_uptodate() trustworthy again
3531 pull: re-fix command line generation
3532 grep: expose "status-only" feature via -q
3533 Fix log -g this@{upstream}
3534 work around an obnoxious bash "safety feature" on OpenBSD
3535 transport_get(): drop unnecessary check for !remote
3536 tests: update tests that used to fail
3537 grep --quiet: finishing touches
3538 Update draft release notes to 1.7.0
3539 RPM packaging: don't include foreign-scm-helper bits yet
3540 is_submodule_modified(): fix breakage with external GIT_INDEX_FILE
3543 gitk: Display submodule diffs with appropriate encoding
3546 gitk: Add Hungarian translation
3548 Linus Torvalds (11):
3549 Remove diff machinery dependency from read-cache
3550 slim down "git show-index"
3551 make "git merge-tree" a built-in
3552 make "git hash-object" a built-in
3553 make "git var" a built-in
3554 make "git patch-id" a built-in
3555 make "merge-index" a built-in
3556 make "mktag" a built-in
3557 make "git unpack-file" a built-in
3558 make "git pack-redundant" a built-in
3559 make "index-pack" a built-in
3561 Markus Heidelberg (2):
3562 gitk: Adjust two equal strings which differed in whitespace
3563 rebase: don't invoke the pager for each commit summary
3566 Add an option for using any HTTP authentication scheme, not only basic
3567 Allow curl to rewind the RPC read buffer
3569 Matthew Ogilvie (3):
3570 build dashless "bin-wrappers" directory similar to installed bindir
3571 run test suite without dashed git-commands in PATH
3572 INSTALL: document a simpler way to run uninstalled builds
3575 Detailed diagnosis when parsing an object name fails.
3576 builtin-config: add --path option doing ~ and ~user expansion.
3577 push: spell 'Note about fast-forwards' section name correctly in error message.
3578 Be more user-friendly when refusing to do something because of conflict.
3579 lockfile: show absolute filename in unable_to_lock_message
3580 branch: warn and refuse to set a branch as a tracking branch of itself.
3582 Michael Haggerty (25):
3583 t3404: Use test_commit to set up test repository
3584 Add a command "fixup" to rebase --interactive
3585 lib-rebase: Provide clearer debugging info about what the editor did
3586 lib-rebase: Allow comments and blank lines to be added to the rebase script
3587 rebase-i: Ignore comments and blank lines in peek_next_command
3588 rebase -i: Make the condition for an "if" more transparent
3589 rebase -i: Remove dead code
3590 rebase -i: Inline expression
3591 rebase -i: Use "test -n" instead of "test ! -z"
3592 rebase -i: Use symbolic constant $MSG consistently
3593 rebase -i: Document how temporary files are used
3594 rebase -i: Introduce a constant AUTHOR_SCRIPT
3595 rebase -i: Introduce a constant AMEND
3596 t3404: Test the commit count in commit messages generated by "rebase -i"
3597 rebase -i: Improve consistency of commit count in generated commit messages
3598 rebase -i: Simplify commit counting for generated commit messages
3599 rebase -i: Extract a function "commit_message"
3600 rebase -i: Handle the author script all in one place in do_next
3601 rebase -i: Extract function do_with_author
3602 rebase -i: Change function make_squash_message into update_squash_message
3603 rebase -i: For fixup commands without squashes, do not start editor
3604 t3404: Set up more of the test repo in the "setup" step
3605 rebase -i: Retain user-edited commit messages after squash/fixup conflicts
3606 rebase -i: Avoid non-portable "test X -a Y"
3607 rebase -i: Enclose sed command substitution in quotes
3609 Michael J Gruber (7):
3610 status -s: respect the status.relativePaths option
3611 t7508-status.sh: Add tests for status -s
3612 builtin-commit: refactor short-status code into wt-status.c
3613 status -s: obey color.status
3614 t7508-status: status --porcelain ignores relative paths setting
3615 t7508-status: test all modes with color
3616 tag -d: print sha1 of deleted tag
3618 Michael Lukashov (1):
3619 Windows: Remove dependency on pthreadGC2.dll
3621 Michele Ballabio (1):
3622 gitk: update Italian translation
3625 builtin-commit: add --date option
3626 Document date formats accepted by parse_date()
3627 gitk: Update Hungarian translation
3629 Nanako Shiraishi (3):
3630 rebase -i --autosquash: auto-squash commits
3631 rebase: fix --onto A...B parsing and add tests
3632 rebase -i: teach --onto A...B syntax
3634 Nguyễn Thái Ngọc Duy (27):
3635 update-index: refactor mark_valid() in preparation for new options
3636 Add test-index-version
3637 Introduce "skip-worktree" bit in index, teach Git to get/set this bit
3638 Teach Git to respect skip-worktree bit (reading part)
3639 Teach Git to respect skip-worktree bit (writing part)
3640 Avoid writing to buffer in add_excludes_from_file_1()
3641 Read .gitignore from index if it is skip-worktree
3642 unpack-trees(): carry skip-worktree bit over in merged_entry()
3643 excluded_1(): support exclude files in index
3644 dir.c: export excluded_1() and add_excludes_from_file_1()
3645 Introduce "sparse checkout"
3646 unpack-trees(): add CE_WT_REMOVE to remove on worktree alone
3647 unpack-trees.c: generalize verify_* functions
3648 unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout
3649 unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index
3650 unpack-trees(): ignore worktree check outside checkout area
3651 read-tree: add --no-sparse-checkout to disable sparse checkout support
3652 Add tests for sparse checkout
3653 sparse checkout: inhibit empty worktree
3654 ie_match_stat(): do not ignore skip-worktree bit with CE_MATCH_IGNORE_VALID
3655 commit: correctly respect skip-worktree bit
3656 grep: do not do external grep on skip-worktree entries
3657 t7002: set test prerequisite "external-grep" if supported
3658 t7002: test for not using external grep on skip-worktree paths
3659 status: only touch path we may need to check
3660 rm: only refresh entries that we may touch
3661 Fix memory corruption when .gitignore does not end by \n
3664 fix git-p4 editor invocation
3666 Peter Collingbourne (1):
3667 Remove empty directories when checking out a commit with fewer submodules
3670 gitk: Update Swedish translation
3673 CVS Server: Support reading base and roots from environment
3675 Ramkumar Ramachandra (1):
3676 Documentation: Update git core tutorial clarifying reference to scripts
3678 Ramsay Allan Jones (5):
3679 MSVC: Fix an "incompatible pointer types" compiler warning
3680 engine.pl: Fix a recent breakage of the buildsystem generator
3681 msvc: Fix an "unrecognized option" linker warning
3682 msvc: Fix a compiler warning due to an incorrect pointer cast
3683 msvc: Add a definition of NORETURN compatible with msvc compiler
3686 Add completion for git-svn mkdirs,reset,and gc
3689 bash: support 'git notes' and its subcommands
3691 Sebastian Schuberth (2):
3692 Make difftool.prompt fall back to mergetool.prompt
3693 If deriving SVN_SSH from GIT_SSH on msys, also add quotes
3696 cvsserver: make the output of 'update' more compatible with cvs.
3698 Shawn O. Pearce (1):
3699 bash completion: add space between branch name and status flags
3702 reset: use "unpack_trees()" directly instead of "git read-tree"
3705 rebase: replace antiquated sed invocation
3706 commit-tree: remove unused #define
3707 tests: consolidate CR removal/addition functions
3708 t0022: replace non-portable literal CR
3709 am: fix patch format detection for Thunderbird "Save As" emails
3710 fix portability issues with $ in double quotes
3713 Add 'git rev-parse --show-toplevel' option.
3714 Use $(git rev-parse --show-toplevel) in cd_to_toplevel().
3716 Sverre Rabbelier (9):
3717 Fix various memory leaks in transport-helper.c
3718 Add Python support library for remote helpers
3719 fast-import: put option parsing code in separate functions
3720 fast-import: put marks reading in its own function
3721 fast-import: add feature command
3722 fast-import: add option command
3723 fast-import: test the new option command
3724 fast-import: allow for multiple --import-marks= arguments
3725 fast-import: add (non-)relative-marks feature
3727 Tarmigan Casebolt (7):
3728 t/lib-http.sh: Restructure finding of default httpd location
3729 Smart-http: check if repository is OK to export before serving it
3730 Smart-http tests: Improve coverage in test t5560
3731 Smart-http tests: Break test t5560-http-backend into pieces
3732 Smart-http tests: Test http-backend without curl or a webserver
3733 Test t5560: Fix test when run with dash
3734 ident.c: replace fprintf with fputs to suppress compiler warning
3737 http: maintain curl sessions
3738 builtin-push: don't access freed transport->url
3739 check stderr with isatty() instead of stdout when deciding to show progress
3740 git-clone.txt: reword description of progress behaviour
3741 clone: set transport->verbose when -v/--verbose is used
3742 clone: use --progress to force progress reporting
3743 t5541-http-push.sh: add tests for non-fast-forward pushes
3744 t5541-http-push.sh: add test for unmatched, non-fast-forwarded refs
3745 refactor ref status logic for pushing
3746 transport.c::transport_push(): make ref status affect return value
3747 transport-helper.c::push_refs(): ignore helper-reported status if ref is not to be pushed
3748 transport-helper.c::push_refs(): emit "no refs" error message
3749 t5541-http-push: make grep expression check for one line only
3752 Use warning function instead of fprintf(stderr, "Warning: ...").
3753 string-list: rename the include guard to STRING_LIST_H
3756 Documentation/git-merge: reword references to "remote" and "pull"
3757 Documentation: warn prominently against merging with dirty trees
3758 Documentation: format full commands in typewriter font
3759 Documentation: spell 'git cmd' without dash throughout
3760 Documentation: show-files is now called git-ls-files
3761 Documentation: emphasise 'git shortlog' in its synopsis
3762 Documentation: improve description of --glob=pattern and friends
3763 Documentation: add missing :: in config.txt
3764 Documentation: move away misplaced 'push --upstream' description
3767 Version v1.6.6.2; changes since v1.6.6.1:
3768 -----------------------------------------
3770 Christopher Beelby (1):
3771 git-gui: Keep repo_config(gui.recentrepos) and .gitconfig in sync
3774 git-cvsserver: allow regex metacharacters in CVSROOT
3776 Giuseppe Bilotta (1):
3777 git-gui: work from the .git dir
3779 Ilari Liusvaara (4):
3781 Fix integer overflow in patch_delta()
3782 Fix integer overflow in unpack_sha1_rest()
3783 Fix integer overflow in unpack_compressed_entry()
3786 blame: prevent a segv when -L given start > EOF
3789 git-gui: Fix applying a line when all following lines are deletions
3792 fix memcpy of overlapping area
3795 git-gui: Correct file_states when unstaging partly staged entry
3798 builtin-config: Fix crash when using "-f <relative path>" from non-root dir
3800 Jonathan Nieder (1):
3801 git-gui: Makefile: consolidate .FORCE-* targets
3803 Junio C Hamano (15):
3804 checkout -m path: fix recreating conflicts
3805 status: don't require the repository to be writable
3806 Fix "log" family not to be too agressive about showing notes
3807 Fix "log --oneline" not to show notes
3808 merge-recursive: do not return NULL only to cause segfault
3809 ignore duplicated slashes in make_relative_path()
3810 approxidate_careful() reports errorneous date string
3811 Update @{bogus.timestamp} fix not to die()
3812 t0101: use a fixed timestamp when searching in the reflog
3813 git-add documentation: Fix shell quoting example
3814 Fix parsing of imap.preformattedHTML and imap.sslverify
3815 git-push: document all the status flags used in the output
3816 check-ref-format documentation: fix enumeration mark-up
3817 t8003: check exit code of command and error message separately
3820 Nguyễn Thái Ngọc Duy (1):
3821 Add missing #include to support TIOCGWINSZ on Solaris
3824 git-gui: handle really long error messages in updateindex.
3827 git-gui: Fix gitk for branch whose name matches local file
3830 archive: complain about path specs that don't match anything
3831 archive: simplify archive format guessing
3834 bash: don't offer remote transport helpers as subcommands
3836 Shawn O. Pearce (1):
3837 fast-import: Stream very large blobs directly to pack
3840 retry request without query when info/refs?query fails
3842 Vitaly "_Vi" Shukela (1):
3843 git-gui: Add hotkeys for "Unstage from commit" and "Revert changes"
3845 Wesley J. Landaker (1):
3846 Update git fsck --full short description to mention packs
3849 Version v1.6.6.1; changes since v1.6.6:
3850 ---------------------------------------
3852 Andreas Gruenbacher (3):
3853 base85 debug code: Fix length byte calculation
3854 base85: encode_85() does not use the decode table
3855 base85: Make the code more obvious instead of explaining the non-obvious
3858 git count-objects: handle packs bigger than 4G
3860 Björn Gustavsson (4):
3861 Documentation: 'git add -A' can remove files
3862 git-add/rm doc: Consistently back-quote
3863 Fix "git remote update" with remotes.defalt set
3864 git-rm doc: Describe how to sync index & work tree
3867 bisect: fix singular/plural grammar nit
3870 fast-import: tag may point to any object type
3873 commit: --cleanup is a message option
3876 reset: unbreak hard resets with GIT_WORK_TREE
3877 textconv: stop leaking file descriptors
3880 grep: NUL terminate input from a file
3882 Jonathan Nieder (2):
3883 Documentation: git gc packs refs by default now
3884 Documentation: tiny git config manual tweaks
3886 Junio C Hamano (10):
3887 t1200: work around a bug in some implementations of "find"
3888 t4019 "grep" portability fix
3889 Start 1.6.6.X maintenance track
3890 Makefile: FreeBSD (both 7 and 8) needs OLD_ICONV
3891 checkout -m: do not try to fall back to --merge from an unborn branch
3892 grep: -L should show empty files
3893 Update draft release notes to 1.6.6.1
3894 Fix mis-backport of t7002
3899 SubmittingPatches: hints to know the status of a submitted patch.
3900 branch: die explicitly why when calling "git branch [-a|-r] branchname".
3901 stash: mention --patch in usage string.
3903 Michael Haggerty (1):
3904 rebase--interactive: Ignore comments and blank lines in peek_next_command
3906 Nathaniel W Filardo (1):
3907 read_index(): fix reading extension size on BE 64-bit archs
3909 Nguyễn Thái Ngọc Duy (2):
3910 Documentation: always respect core.worktree if set
3911 t7102: make the test fail if one of its check fails
3913 Ramkumar Ramachandra (1):
3914 Document git-blame triple -C option
3916 Richard Weinberger (1):
3917 Fix uninitialized variable in get_refs_via_rsync().
3919 Shawn O. Pearce (2):
3920 fast-import: Document author/committer/tagger name is optional
3921 remote-curl: Fix Accept header for smart HTTP connections
3924 octopus: make merge process simpler to follow
3925 octopus: reenable fast-forward merges
3926 octopus: remove dead code
3928 Tarmigan Casebolt (1):
3929 Add git-http-backend to command-list.
3932 bash completion: factor submodules into dirty state
3935 Version v1.6.6; changes since v1.6.6-rc4:
3936 -----------------------------------------
3939 git-svn: Remove obsolete MAXPARENT check
3942 Prevent git blame from segfaulting on a missing author name
3945 git svn: fix --revision when fetching deleted paths
3946 update release notes for git svn in 1.6.6
3947 git svn: lookup new parents correctly from svn:mergeinfo
3948 git svn: branch/tag commands detect username in URLs
3954 git svn: add test for a git svn gc followed by a git svn mkdirs
3957 git-svn: expand the svn mergeinfo test suite, highlighting some failures
3958 git-svn: memoize conversion of SVN merge ticket info to git commit ranges
3959 git-svn: fix some mistakes with interpreting SVN mergeinfo commit ranges
3960 git-svn: exclude already merged tips using one rev-list call
3961 git-svn: detect cherry-picks correctly.
3964 Version v1.6.6-rc4; changes since v1.6.6-rc3:
3965 ---------------------------------------------
3967 Björn Gustavsson (1):
3968 rebase -i: abort cleanly if the editor fails to launch
3971 git svn: make empty directory creation gc-aware
3972 t9146: use 'svn_cmd' wrapper
3978 api-strbuf.txt: fix typos and document launch_editor()
3979 technical-docs: document hash API
3982 Version v1.6.6-rc3; changes since v1.6.6-rc2:
3983 ---------------------------------------------
3985 Björn Gustavsson (1):
3986 bash: Support new 'git fetch' options
3989 ignore unknown color configuration
3992 help.autocorrect: do not run a command if the command given is junk
3995 Remove post-upload-hook
3996 Fix archive format with -- on the command line
3998 Update Release Notes for 1.6.6 to remove old bugfixes
3999 worktree: don't segfault with an absolute pathspec without a work tree
4003 Nanako Shiraishi (1):
4004 Illustrate "filter" attribute with an example
4007 Version v1.6.6-rc2; changes since v1.6.6-rc1:
4008 ---------------------------------------------
4011 git-svn: sort svk merge tickets to account for minimal parents
4012 git-svn: Set svn.authorsfile to an absolute path when cloning
4013 git-svn: set svn.authorsfile earlier when cloning
4015 Alexander Gavrilov (1):
4016 git-gui: Increase blame viewer usability on MacOS.
4019 gitk: Skip translation of "wrong Tcl version" message
4022 t4201: use ISO8859-1 rather than ISO-8859-1
4023 t9001: use older Getopt::Long boolean prefix '--no' rather than '--no-'
4025 Clemens Buchacher (1):
4026 git-gui: search 4 directories to improve statistic of gc hint
4029 git svn: log removals of empty directories
4032 git svn: Don't create empty directories whose parents were deleted
4034 Guillermo S. Romero (1):
4035 gitk: Add configuration for UI colour scheme
4038 git gui: make current branch default in "remote delete branch" merge check
4041 gitweb: Describe (possible) gitweb.js minification in gitweb/README
4044 pull: clarify advice for the unconfigured error case
4047 rerere: don't segfault on failure to open rr-cache
4048 reset: improve worktree safety valves
4049 add-interactive: fix deletion of non-empty files
4052 gitk: Fix diffing committed -> staged (typo in diffcmd)
4053 gitk: Use the --submodule option for displaying diffs when available
4055 Jindrich Makovicka (1):
4056 git-gui: suppress RenderBadPicture X error caused by Tk bug
4059 Fix crasher on encountering SHA1-like non-note in notes tree
4062 Documentation/Makefile: allow man.base.url.for.relative.link to be set from Make
4063 Unconditionally set man.base.url.for.relative.links
4065 Documentation: xmlto 0.0.18 does not know --stringparam
4068 Revert recent "git merge <msg> HEAD <commit>..." deprecation
4069 Update draft release notes to 1.6.6 before -rc2
4073 Fix diff -B/--dirstat miscounting of newly added contents
4075 Markus Heidelberg (1):
4076 gitk: Fix "git gui blame" invocation when called from top-level directory
4079 gitk: Add Japanese translation
4080 gitk: Update Japanese translation
4083 gitk: Use themed tk widgets
4084 gitk: Fix errors in the theme patch
4085 gitk: Default to the system colours on Windows
4086 gitk: Fix selection of tags
4089 gitk: Restore scrolling position of diff pane on back/forward in history
4090 gitk: Add a user preference to enable/disable use of themed widgets
4091 gitk: Show diff of commits at end of compare-commits output
4092 gitk: Don't compare fake children when comparing commits
4093 gitk: Improve appearance of radiobuttons and checkbuttons
4096 archive: clarify description of path parameter
4099 bash: update 'git commit' completion
4101 Sitaram Chamarty (1):
4102 gitk: Disable checkout of remote branches
4105 Documentation: Avoid use of xmlto --stringparam
4108 Version v1.6.6-rc1; changes since v1.6.6-rc0:
4109 ---------------------------------------------
4112 builtin-merge.c: call exclude_cmds() correctly.
4114 Benjamin Kramer (1):
4115 Explicitly truncate bswap operand to uint32_t
4118 Give the hunk comment its own color
4119 get_ref_states: strdup entries and free util in stale list
4121 Björn Gustavsson (11):
4122 Teach the --all option to 'git fetch'
4123 Teach the --multiple option to 'git fetch'
4124 Add the configuration option skipFetchAll
4125 Add missing test for 'git remote update --prune'
4126 Re-implement 'git remote update' using 'git fetch'
4127 Clarify and correct -z
4128 apply: apply works outside a repository
4129 apply: Format all options using back-quotes
4130 apply: Use the term "working tree" consistently
4131 Fix over-simplified documentation for 'git log -z'
4132 gitworkflows: Consistently back-quote git commands
4134 Brian Gernhardt (1):
4135 t/gitweb-lib: Split HTTP response with non-GNU sed
4137 Christian Couder (6):
4138 Documentation: add "Fighting regressions with git bisect" article
4139 replace: use a GIT_NO_REPLACE_OBJECTS env variable
4140 Documentation: fix typos and spelling in replace documentation
4141 Documentation: talk a little bit about GIT_NO_REPLACE_OBJECTS
4142 bisect: simplify calling visualizer using '--bisect' option
4143 Documentation: update descriptions of revision options related to '--bisect'
4146 help: Do not unnecessarily look for a repository
4148 David Soria Parra (1):
4149 Documentation: Document --branch option in git clone synopsis
4152 commit -c/-C/--amend: reset timestamp and authorship to committer with --reset-author
4154 Felipe Contreras (3):
4155 format-patch: fix parsing of "--" on the command line
4156 format-patch: add test for parsing of "--"
4157 send-email: automatic envelope sender
4159 Horst H. von Brand (1):
4160 git-pull.sh: Fix call to git-merge for new command format
4162 Jakub Narebski (10):
4163 gitweb: Add optional "time to generate page" info in footer
4164 gitweb: Incremental blame (using JavaScript)
4165 gitweb: Colorize 'blame_incremental' view during processing
4166 gitweb: Create links leading to 'blame_incremental' using JavaScript
4167 gitweb: Minify gitweb.js if JSMIN is defined
4168 t/gitweb-lib.sh: Split gitweb output into headers and body
4169 gitweb: Document current snapshot rules via new tests
4170 gitweb.js: Harden setting blamed commit info in incremental blame
4171 gitweb: Make linking to actions requiring JavaScript a feature
4172 gitweb: Add link to other blame implementation in blame views
4175 remote: refactor some logic into get_stale_heads()
4176 teach warn_dangling_symref to take a FILE argument
4177 builtin-fetch: add --prune option
4178 builtin-fetch: add --dry-run option
4181 prune-packed: only show progress when stderr is a tty
4184 t4014-format-patch: do not assume 'test' is available as non-builtin
4185 Add a notice that only certain functions can print color escape codes
4187 Jonathan Nieder (1):
4188 Makefile: do not clean arm directory
4190 Junio C Hamano (19):
4191 mailinfo: -b option keeps [bracketed] strings that is not a [PATCH] marker
4192 Pretty-format: %[+-]x to tweak inter-item newlines
4193 read_revision_from_stdin(): use strbuf
4194 Teach --stdin option to "log" family
4195 setup_revisions(): do not call get_pathspec() too early
4196 Make --stdin option to "log" family read also pathspecs
4197 t9001: test --envelope-sender option of send-email
4198 Add trivial tests for --stdin option to log family
4199 Protect scripted Porcelains from GREP_OPTIONS insanity
4200 builtin-apply.c: pay attention to -p<n> when determining the name
4201 Remove dead code from "git am"
4202 emit_line(): don't emit an empty <SET><RESET> followed by a newline
4203 Update draft release notes to 1.6.6 before merging topics for -rc1
4204 git-merge: a deprecation notice of the ancient command line syntax
4205 Update draft release notes to 1.6.6 before -rc1
4206 Do not misidentify "git merge foo HEAD" as an old-style invocation
4207 merge: do not add standard message when message is given with -m option
4212 gitweb: check given hash before trying to create snapshot
4213 gitweb: Smarter snapshot names
4216 Disable CURLOPT_NOBODY before enabling CURLOPT_PUT and CURLOPT_POST
4217 Refactor winsock initialization into a separate function
4218 Enable support for IPv6 on MinGW
4220 Matthew Ogilvie (5):
4221 cvsserver doc: database generally can not be reproduced consistently
4222 config documentation: some configs are auto-set by git-init
4223 t2300: use documented technique to invoke git-sh-setup
4224 t3409 t4107 t7406 t9150: use dashless commands
4225 t/README: Document GIT_TEST_INSTALLED and GIT_TEST_EXEC_PATH
4228 merge-recursive: point the user to commit when file would be overwritten.
4229 user-manual: Document that "git merge" doesn't like uncommited changes.
4230 merge-recursive: make the error-message generation an extern function
4231 builtin-merge: show user-friendly error messages for fast-forward too.
4233 Michael J Gruber (1):
4234 Documentation: Fix a few i.e./e.g. mix-ups
4236 Nanako Shiraishi (2):
4237 t1200: fix a timing dependent error
4238 prepare send-email for smoother change of --chain-reply-to default
4241 pack-objects: split implications of --all-progress from progress activation
4243 Ramsay Allan Jones (1):
4244 git-count-objects: Fix a disk-space under-estimate on Cygwin
4247 strbuf_add_wrapped_text(): skip over colour codes
4248 mergetool--lib: simplify guess_merge_tool()
4251 gitweb.js: fix null object exception in initials calculation
4252 instaweb: restart server if already running
4253 gitweb.js: fix padLeftStr() and its usage
4256 remote-curl.c: fix rpc_out()
4258 Uwe Kleine-König (1):
4259 shortlog: respect commit encoding
4262 Version v1.6.6-rc0; changes since v1.6.5.7:
4263 -------------------------------------------
4266 git-gui: Update russian translation
4268 Alexey Borzenkov (1):
4269 git-gui: store wm state and fix wm geometry
4272 bisect reset: Allow resetting to any commit, not just a branch
4275 configure: add macro to set arbitrary make variables
4276 configure: add settings for gitconfig, editor and pager
4278 Björn Gustavsson (10):
4279 Teach 'rebase -i' the command "reword"
4280 bash: complete more options for 'git rebase'
4281 Teach 'git merge' and 'git pull' the option --ff-only
4282 format-patch: Always generate a patch
4283 format-patch documentation: Remove diff options that are not useful
4284 format-patch documentation: Fix formatting
4285 format-patch: Add "--no-stat" as a synonym for "-p"
4286 bash: add the merge option --ff-only
4287 Fix truncated usage messages
4288 User Manual: Write "Git" instead of "GIT"
4290 Christian Couder (1):
4291 git: add --no-replace-objects option to disable replacing
4293 Clemens Buchacher (2):
4294 remote-helpers: return successfully if everything up-to-date
4295 set httpd port before sourcing lib-httpd
4298 git-gui: Limit display to a maximum number of files
4301 submodule.c: Squelch a "use before assignment" warning
4304 commit: More generous accepting of RFC-2822 footer lines.
4307 git-blame.el: Change how blame information is shown.
4310 git svn: fix fetch where glob is on the top-level URL
4311 git svn: read global+system config for clone+init
4312 git svn: add authorsfile test case for ~/.gitconfig
4313 git svn: attempt to create empty dirs on clone+rebase
4314 git svn: always reuse existing remotes on fetch
4315 git svn: strip leading path when making empty dirs
4318 imap-send: use separate read and write fds
4319 imap-send: use run-command API for tunneling
4320 imap-send: fix compilation-error on Windows
4321 imap-send: build imap-send on Windows
4322 mingw: wrap SSL_set_(w|r)fd to call _get_osfhandle
4323 mingw: enable OpenSSL
4325 Felipe Contreras (2):
4327 Use 'fast-forward' all over the place
4330 git-gui: remove warning when deleting correctly merged remote branch
4332 Ingmar Vanhassel (1):
4333 import-tars: Add support for tarballs compressed with lzma, xz
4336 gitweb: Add 'show-sizes' feature to show blob sizes in tree view
4337 gitweb: Refactor 'log' action generation, adding git_log_body()
4338 gitweb: Refactor common parts of 'log' and 'shortlog' views
4339 gitweb: Make 'history' view (re)use git_log_generic()
4342 Teach "git describe" --dirty option
4345 imap-send: remove useless uid code
4346 gitignore: root most patterns at the top-level directory
4347 t915{0,1}: use $TEST_DIRECTORY
4350 git-gui: display summary when showing diff of a submodule
4351 git-gui: fix diff for partially staged submodule changes
4352 git submodule add: make the <path> parameter optional
4353 git-gui: fix use of uninitialized variable
4354 add tests for git diff --submodule
4356 Jimmy Angelakos (1):
4357 git-gui: Added Greek translation & glossary
4360 Teach "-m <msg>" and "-F <file>" to "git notes edit"
4361 fast-import: Add support for importing commit notes
4362 t3302-notes-index-expensive: Speed up create_repo()
4363 Add flags to get_commit_notes() to control the format of the note string
4364 Teach notes code to free its internal data structures on request
4365 Teach the notes lookup code to parse notes trees with various fanout schemes
4366 Add selftests verifying that we can parse notes trees with various fanouts
4367 Refactor notes code to concatenate multiple notes annotating the same object
4368 Add selftests verifying concatenation of multiple notes for the same commit
4370 Johannes Schindelin (8):
4371 print_wrapped_text(): allow hard newlines
4372 Add strbuf_add_wrapped_text() to utf8.[ch]
4373 Introduce commit notes
4374 Add a script to edit/inspect notes
4375 Speed up git notes lookup
4376 Add an expensive test for git-notes
4377 Add '%N'-format for pretty-printing commit notes
4378 Add the --submodule option to the diff option family
4381 Windows: use BLK_SHA1 again
4383 Jonathan Nieder (34):
4384 Add tests for git check-ref-format
4385 check-ref-format: simplify --print implementation
4386 Handle more shell metacharacters in editor names
4387 Retire fetch--tool helper to contrib/examples
4388 Show usage string for 'git grep -h'
4389 Show usage string for 'git cherry -h'
4390 Show usage string for 'git commit-tree -h'
4391 Show usage string for 'git merge-ours -h'
4392 Show usage string for 'git show-ref -h'
4393 http-fetch: add missing initialization of argv0_path
4394 Show usage string for 'git check-ref-format -h'
4395 Show usage string for 'git fast-import -h'
4396 Show usage string for 'git get-tar-commit-id -h'
4397 Show usage string for 'git imap-send -h'
4398 Show usage string for 'git mailsplit -h'
4399 Show usage string for 'git merge-one-file -h'
4400 Show usage string for 'git rev-parse -h'
4401 Show usage string for 'git show-index -h'
4402 Show usage string for 'git unpack-file -h'
4403 Show usage string for 'git stripspace -h'
4404 Let 'git http-fetch -h' show usage outside any git repository
4405 Show usage string for 'git http-push -h'
4406 Let 'git <command> -h' show usage without a git dir
4407 Introduce usagef() that takes a printf-style format
4408 merge-{recursive,subtree}: use usagef() to print usage
4409 diff --no-index: make the usage string less scary
4410 Do not use VISUAL editor on dumb terminals
4411 Suppress warnings from "git var -l"
4412 Teach git var about GIT_EDITOR
4413 Teach git var about GIT_PAGER
4414 add -i, send-email, svn, p4, etc: use "git var GIT_EDITOR"
4415 am -i, git-svn: use "git var GIT_PAGER"
4416 Provide a build time default-editor setting
4417 Speed up bash completion loading
4419 Julian Phillips (4):
4420 fetch: Speed up fetch by rewriting find_non_local_tags
4421 remote: Make ref_remove_duplicates faster for large numbers of refs
4422 fetch: Speed up fetch of large numbers of refs
4423 remote: fix use-after-free error detected by glibc in ref_remove_duplicates
4425 Junio C Hamano (20):
4426 diff-lib.c: fix misleading comments on oneway_diff()
4427 unpack-trees: typofix
4428 unpack_callback(): use unpack_failed() consistently
4429 git check-ref-format --print
4431 check_filename(): make verify_filename() callable without dying
4432 DWIM "git checkout frotz" to "git checkout -b frotz origin/frotz"
4433 format_commit_message(): fix function signature
4434 fsck: default to "git fsck --full"
4435 git checkout --no-guess
4436 Teach --wrap to only indent without wrapping
4437 Update draft release notes to 1.6.6
4438 Revert "Don't create the $GIT_DIR/branches directory on init"
4439 t1200: further modernize test script style
4440 t1200: prepare for merging with Fast-forward bikeshedding
4441 builtin-commit.c: fix logic to omit empty line before existing footers
4442 git-describe.txt: formatting fix
4443 Provide a build time default-pager setting
4444 Update draft release notes to 1.6.6
4448 Add '--bisect' revision machinery argument
4450 Marius Storm-Olsen (1):
4451 MSVC: Enable OpenSSL, and translate -lcrypto
4454 http-backend: add GIT_PROJECT_ROOT environment var
4455 http-backend: reword some documentation
4456 http-backend: use mod_alias instead of mod_rewrite
4457 http-backend: add example for gitweb on same URL
4458 http-backend: more explict LocationMatch
4461 instaweb: support mod_cgid for apache2
4463 Markus Heidelberg (1):
4464 bash completion: difftool accepts the same options as diff
4466 Michael J Gruber (1):
4467 Make t9150 and t9151 test scripts executable
4470 pack-objects: move thread autodetection closer to relevant code
4472 Ramsay Allan Jones (2):
4473 Makefile: keep MSVC and Cygwin configuration separate
4474 MSVC: Add support for building with NO_MMAP
4477 describe: load refnames before calling describe()
4478 Implement wrap format %w() as if it is a mode switch
4479 log --format: don't ignore %w() at the start of format string
4480 grep: unset GREP_OPTIONS before spawning external grep
4481 strbuf_add_wrapped_text(): factor out strbuf_add_indented_text()
4482 log --format: document %w
4484 Robin Rosenberg (1):
4485 Don't create the $GIT_DIR/branches directory on init
4488 Documentation: add 'git replace' to main git manpage
4491 git-svn: add test data for SVK merge, with script.
4492 git-svn: allow test setup script to support PERL env. var
4493 git-svn: convert SVK merge tickets to extra parents
4494 git-svn: add test data for SVN 1.5+ merge, with script.
4495 git-svn: convert SVN 1.5+ / svnmerge.py svn:mergeinfo props to parents
4498 mergetool--lib: add p4merge as a pre-configured mergetool option
4499 Update packfile transfer protocol documentation
4501 Sebastian Schuberth (2):
4502 Use faster byte swapping when compiling with MSVC
4503 Make the MSVC projects use PDB/IDB files named after the project
4505 Shawn O. Pearce (27):
4506 git-gui: Ensure submodule path is quoted properly
4507 pkt-line: Add strbuf based functions
4508 pkt-line: Make packet_read_line easier to debug
4509 fetch-pack: Use a strbuf to compose the want list
4510 Move "get_ack()" back to fetch-pack
4511 Add multi_ack_detailed capability to fetch-pack/upload-pack
4512 remote-curl: Refactor walker initialization
4513 fetch: Allow transport -v -v -v to set verbosity to 3
4514 remote-helpers: Fetch more than one ref in a batch
4515 remote-helpers: Support custom transport options
4516 Move WebDAV HTTP push under remote-curl
4517 Git-aware CGI to provide dumb HTTP transport
4518 Add stateless RPC options to upload-pack, receive-pack
4519 Smart fetch and push over HTTP: server side
4520 Discover refs via smart HTTP server when available
4521 Smart push over HTTP: client side
4522 Smart fetch over HTTP: client side
4523 Smart HTTP fetch: gzip requests
4524 http tests: use /dumb/ URL prefix
4525 test smart http fetch and push
4526 http-backend: Use http.getanyfile to disable dumb HTTP serving
4527 http-backend: Test configuration options
4528 Git-aware CGI to provide dumb HTTP transport
4529 http-backend: Protect GIT_PROJECT_ROOT from /../ requests
4530 t5551-http-fetch: Work around some libcurl versions
4531 t5551-http-fetch: Work around broken Accept header in libcurl
4532 http-backend: Fix bad treatment of uintmax_t in Content-Length
4535 rebase -i: fix reword when using a terminal editor
4536 gitweb: linkify author/committer names with search
4537 t1402: Make test executable
4538 t1200: cleanup and modernize test style
4539 t1200: Make documentation and test agree
4540 t3101: test more ls-tree options
4541 ls-tree: migrate to parse-options
4543 Tarmigan Casebolt (3):
4544 Check the format of more printf-type functions
4545 http-backend: Fix access beyond end of string.
4546 http-backend: Let gcc check the format of more printf-type functions.
4549 http-push: fix check condition on http.c::finish_http_pack_request()
4550 t5540-http-push: remove redundant fetches
4553 Documentation: update pt-BR
4556 bash completion: complete refs for git-grep
4557 Let --decorate show HEAD position
4558 Refactor pretty_print_commit arguments into a struct
4559 reflog-walk: refactor the branch@{num} formatting
4560 Introduce new pretty formats %g[sdD] for reflog information
4561 stash list: use new %g formats instead of sed
4562 stash list: drop the default limit of 10 stashes
4563 describe: when failing, tell the user about options that work
4564 filter-branch: stop special-casing $filter_subdir argument
4565 filter-branch: nearest-ancestor rewriting outside subdir filter
4566 Documentation: clarify 'ours' merge strategy
4567 rebase docs: clarify --merge and --strategy
4568 Document git-svn's first-parent rule
4569 describe: do not use unannotated tag even if exact match
4572 git svn: handle SVN merges from revisions past the tip of the branch
4575 git-gui: adjust the minimum height of diff pane for shorter screen height
4578 git-update-index.txt: Document the --really-refresh option.
4581 Version v1.6.5.7; changes since v1.6.5.6:
4582 -----------------------------------------
4585 ignore unknown color configuration
4588 help.autocorrect: do not run a command if the command given is junk
4591 worktree: don't segfault with an absolute pathspec without a work tree
4594 Nanako Shiraishi (1):
4595 Illustrate "filter" attribute with an example
4598 Version v1.6.5.6; changes since v1.6.5.5:
4599 -----------------------------------------
4602 pull: clarify advice for the unconfigured error case
4605 add-interactive: fix deletion of non-empty files
4608 Remove post-upload-hook
4609 Fix archive format with -- on the command line
4613 merge-recursive: make the error-message generation an extern function
4614 builtin-merge: show user-friendly error messages for fast-forward too.
4617 Version v1.6.5.5; changes since v1.6.5.4:
4618 -----------------------------------------
4621 builtin-merge.c: call exclude_cmds() correctly.
4624 t4201: use ISO8859-1 rather than ISO-8859-1
4627 grep: Allow case insensitive search of fixed-strings
4629 Felipe Contreras (2):
4630 format-patch: fix parsing of "--" on the command line
4631 format-patch: add test for parsing of "--"
4634 diffcore-break: free filespec data as we go
4635 diffcore-break: save cnt_data for other phases
4636 rerere: don't segfault on failure to open rr-cache
4637 reset: improve worktree safety valves
4640 diffcore-rename: reduce memory footprint by freeing blob data early
4641 Documentation: avoid xmlto input error
4642 Protect scripted Porcelains from GREP_OPTIONS insanity
4643 Remove dead code from "git am"
4644 Documentation: xmlto 0.0.18 does not know --stringparam
4649 Fix diff -B/--dirstat miscounting of newly added contents
4651 Lukas Sandström (1):
4652 git am/mailinfo: Don't look at in-body headers when rebasing
4654 Matthew Ogilvie (1):
4655 core.autocrlf documentation: mention the crlf attribute
4658 Expand ~ and ~user in core.excludesfile, commit.template
4659 expand_user_path: expand ~ to $HOME, not to the actual homedir.
4660 merge-recursive: point the user to commit when file would be overwritten.
4661 user-manual: Document that "git merge" doesn't like uncommited changes.
4664 give priority to progress messages
4666 Philippe Bruhat (1):
4667 Make sure $PERL_PATH is defined when the test suite is run.
4670 Add branch management for releases to gitworkflows
4672 Ramsay Allan Jones (3):
4673 Makefile: merge two Cygwin configuration sections into one
4674 t9700-perl-git.sh: Fix a test failure on Cygwin
4675 git-count-objects: Fix a disk-space under-estimate on Cygwin
4678 mergetool--lib: simplify guess_merge_tool()
4679 archive: clarify description of path parameter
4682 Update 'git remote update' usage string to match man page.
4683 git remote: Separate usage strings for subcommands
4686 Documentation: Avoid use of xmlto --stringparam
4688 Uwe Kleine-König (1):
4689 shortlog: respect commit encoding
4692 Version v1.6.5.4; changes since v1.6.5.3:
4693 -----------------------------------------
4696 help: Do not unnecessarily look for a repository
4698 David Soria Parra (1):
4699 Documentation: Document --branch option in git clone synopsis
4702 Documentation: undocument gc'd function graph_release()
4705 prune-packed: only show progress when stderr is a tty
4708 builtin-apply.c: pay attention to -p<n> when determining the name
4709 Do not misidentify "git merge foo HEAD" as an old-style invocation
4710 merge: do not add standard message when message is given with -m option
4712 Documentation/Makefile: allow man.base.url.for.relative.link to be set from Make
4713 Unconditionally set man.base.url.for.relative.links
4716 Michael J Gruber (1):
4717 Documentation: Fix a few i.e./e.g. mix-ups
4720 pack-objects: split implications of --all-progress from progress activation
4723 instaweb: restart server if already running
4726 Version v1.6.5.3; changes since v1.6.5.2:
4727 -----------------------------------------
4729 Björn Gustavsson (1):
4730 git-clone.txt: Fix grammar and formatting
4732 Björn Steinbrink (1):
4733 pre-commit.sample: Diff against the empty tree when HEAD is invalid
4735 Clemens Buchacher (1):
4736 modernize fetch/merge/pull examples
4738 Daniel Barkalow (2):
4739 Require a struct remote in transport_get()
4740 Allow curl helper to work without a local repository
4742 Dmitry V. Levin (1):
4743 Makefile: add compat/bswap.h to LIB_H
4746 help -i: properly error out if no info viewer can be found
4749 More precise description of 'git describe --abbrev'
4750 Fix documentation grammar typo
4752 Giuseppe Bilotta (1):
4753 gitweb: fix esc_param
4756 gitweb: Do not show 'patch' link for merge commits
4759 rebase -i: more graceful handling of invalid commands
4762 Documentation/fetch-options.txt: order options alphabetically
4763 Documentation/git-pull.txt: Add subtitles above included option files
4764 Documentation/merge-options.txt: order options in alphabetical groups
4767 cvsimport: fix relative argument filenames
4768 push: always load default config
4769 add-interactive: handle deletion of empty files
4770 ls-files: unbreak "ls-files -i"
4771 push: fix typo in usage
4772 format-patch: make "-p" suppress diffstat
4774 Johannes Schindelin (3):
4775 blame: make sure that the last line ends in an LF
4776 help -a: do not unnecessarily look for a repository
4777 diff --color-words -U0: fix the location of hunk headers
4779 Jonathan Nieder (4):
4780 clone: detect extra arguments
4781 Add intermediate build products to .gitignore
4782 check-ref-format: update usage string
4783 merge: do not setup worktree twice
4785 Junio C Hamano (22):
4786 apply --whitespace=fix: fix handling of blank lines at the eof
4787 apply --whitespace=fix: detect new blank lines at eof correctly
4788 apply.c: split check_whitespace() into two
4789 apply --whitespace=warn/error: diagnose blank at EOF
4790 apply --whitespace: warn blank but not necessarily empty lines at EOF
4791 diff.c: the builtin_diff() deals with only two-file comparison
4792 diff --whitespace=warn/error: obey blank-at-eof
4793 diff --whitespace=warn/error: fix blank-at-eof check
4794 diff --color: color blank-at-eof
4795 core.whitespace: split trailing-space into blank-at-{eol,eof}
4796 diff --whitespace: fix blank lines at end
4797 diff.c: shuffling code around
4798 diff.c: split emit_line() from the first char and the rest of the line
4799 diff.c: emit_add_line() takes only the rest of the line
4800 diff -B: colour whitespace errors
4801 info/grafts: allow trailing whitespaces at the end of line
4802 gc --auto --quiet: make the notice a bit less verboase
4803 receive-pack: run "gc --auto --quiet" and optionally "update-server-info"
4804 clone: fix help on options
4805 diff --color-words: bit of clean-up
4806 check-ref-format -h: it does not know the --print option yet
4809 Markus Heidelberg (1):
4810 t4034-diff-words: add a test for word diff without context
4813 gitweb: Fix blob linenr links in pathinfo mode
4815 Sebastian Schuberth (1):
4816 Do not try to remove directories when removing old links
4819 git-add.txt: fix formatting of --patch section
4822 Quote ' as \(aq in manpages
4825 Makefile: Ensure rpm packages can be read by older rpm versions
4828 imap-send.c: fix compiler warnings for OpenSSL 1.0
4831 Version v1.6.5.2; changes since v1.6.5.1:
4832 -----------------------------------------
4835 Work around option parsing bug in the busybox tar implementation
4837 Carlos R. Mafra (1):
4838 Makefile: clean block-sha1/ directory instead of mozilla-sha1/
4841 ls-files: excludes should not impact tracked files
4842 document push's new quiet option
4845 git-send-email.perl: fold multiple entry "Cc:" and multiple single line "RCPT TO:"s
4848 Remove a left-over file from t/t5100
4849 Mark files in t/t5100 as UTF-8
4851 Jonathan Nieder (1):
4852 Documentation: describe check-ref-format --branch
4855 Fix incorrect error check while reading deflated pack data
4856 Do not fail "describe --always" in a tag-less repository
4857 Fix list of released versions in the toc document
4860 Markus Heidelberg (1):
4861 t7800-difftool: fix the effectless GIT_DIFFTOOL_PROMPT test
4864 Documentation/git-gc.txt: change "references" to "reference"
4866 Nanako Shiraishi (2):
4867 git push: remove incomplete options list from help text
4868 git push: say that --tag can't be used with --all or --mirror in help text
4870 Nasser Grainawi (1):
4871 Document `delta` attribute in "git help attributes".
4874 git-add--interactive: never skip files included in index
4877 Version v1.6.5.1; changes since v1.6.5:
4878 ---------------------------------------
4880 Björn Steinbrink (1):
4881 clone: Supply the right commit hash to post-checkout when -b is used
4884 remote-curl: add missing initialization of argv0_path
4890 grep: do not segfault when -f is used
4893 git-stash documentation: mention default options for 'list'
4896 change throughput display units with fast links
4898 Shawn O. Pearce (1):
4899 sha1_file: Fix infinite loop when pack is corrupted
4902 Version v1.6.5; changes since v1.6.4.4:
4903 ---------------------------------------
4906 svn: Add && to t9107-git-svn-migrate.sh
4907 svn: Honor --prefix option in init without --stdlayout
4908 svn: allow branches outside of refs/remotes
4909 filter-branch: add --prune-empty to option summary
4912 graph API: use a new color when starting a brand new column
4913 graph API: fix bug in graph_is_interesting()
4914 Add tests for rev-list --graph with options that simplify history
4917 Add a reminder test case for a merge with F/D transition
4918 Add date formatting and parsing functions relative to a given time
4920 Alexander Gavrilov (1):
4921 git-svn: Avoid spurious errors when rewriteRoot is used.
4923 Alexandre Julliard (1):
4924 read-tree: Fix regression with creation of a new index file.
4927 parse-opt: ignore negation of OPT_NONEG for ambiguity checks
4929 André Goddard Rosa (1):
4930 Fix typos on pt_BR/gittutorial.txt translation
4933 ls-files: die instead of fprintf/exit in -i error
4935 Benjamin Kramer (1):
4936 gitweb: Optimize git-favicon.png
4938 Björn Gustavsson (1):
4939 bash: add support for 'git replace'
4941 Björn Steinbrink (1):
4942 git-describe: Die early if there are no possible descriptions
4945 strbuf: add new function strbuf_getwholeline()
4946 builtin-mailinfo,builtin-mailsplit: use strbufs
4947 builtin-mailsplit.c: remove read_line_with_nul() since it is no longer used
4948 block-sha1/sha1.c: silence compiler complaints by casting void * to char *
4949 git-compat-util.h: remove superfluous test for __sun__
4950 Makefile: remove pointless conditional assignment in SunOS section
4951 abspath.c: move declaration of 'len' into inner block and use appropriate type
4952 commit.c: rename variable named 'n' which masks previous declaration
4953 t/test-lib.sh: provide a shell implementation of the 'yes' utility
4954 perl/Makefile.PL: detect MakeMaker versions incompatible with DESTDIR
4955 Documentation/git-gc.txt: default --aggressive window is 250, not 10
4956 Makefile: enable THREADED_DELTA_SEARCH on SunOS
4957 Makefile: enable THREADED_DELTA_SEARCH on IRIX and IRIX64
4958 Makefile: add a note about the NO_MMAP setting on IRIX and IRIX64
4960 Brian Gernhardt (4):
4961 INSTALL: Update description of our SHA-1 code
4962 Makefile: Add NEEDS_CRYPTO_WITH_SSL
4963 INSTALL: Reorder dependencies, split shell and Perl
4964 INSTALL: Describe dependency knobs from Makefile
4966 Brian Gianforcaro (1):
4967 Style fixes, add a space after if/for/while.
4969 Christian Couder (13):
4970 refs: add a "for_each_replace_ref" function
4971 replace_object: add mechanism to replace objects found in "refs/replace/"
4972 sha1_file: add a "read_sha1_file_repl" function
4973 object: call "check_sha1_signature" with the replacement sha1
4974 replace_object: add a test case
4975 mktag: call "check_sha1_signature" with the replacement sha1
4976 environment: add global variable to disable replacement
4977 Add new "git replace" command
4978 builtin-replace: teach "git replace" to actually replace
4979 parse-options: add new function "usage_msg_opt"
4980 builtin-replace: use "usage_msg_opt" to give better error messages
4981 Documentation: add documentation for "git replace"
4982 t6050: check pushing something based on a replaced commit
4984 Christian Himpel (2):
4985 git-am: fixed patch_format detection according to RFC2822
4986 git-am: force egrep to use correct characters set
4988 Clemens Buchacher (3):
4989 preserve mtime of local clone
4990 test local clone by copying
4991 cvs: initialize empty password
4993 Daniel Barkalow (4):
4994 Add support for external programs for handling native fetches
4995 Use an external program to implement fetching with curl
4996 Make the "traditionally-supported" URLs a special case
4997 Use a clearer style to issue commands to remote helpers
5000 Add git-replace to .gitignore
5003 git.el: Clarify documentation of git-commit-tree
5005 David Soria Parra (1):
5006 run-command.c: squelch a "use before assignment" warning
5009 git-cvsimport: add support for cvs pserver password scrambling.
5012 git-archive: add '-o' as a alias for '--output'
5013 git-archive: infer output format from filename when unspecified
5016 svn: initial "master" points to trunk if possible
5017 svn: (cleanup) use predefined constant for rev_map_fmt
5018 svn: assume URLs from the command-line are URI-encoded
5021 increase portability of NORETURN declarations
5022 add NORETURN_PTR for function pointers
5024 Felipe Contreras (1):
5025 send-email: fix mutt regex for grouped aliases
5028 Avoid declaration after statement
5029 Change regerror() declaration from K&R style to ANSI C (C89)
5030 Fix __stdcall placement and function prototype
5031 Test for WIN32 instead of __MINGW32_
5032 Add MinGW header files to build git with MSVC
5033 Add platform files for porting to MSVC
5035 Frederik Schwarzer (1):
5036 Correct minor typo in post-receive hook template
5038 Geoffrey Irving (1):
5039 git fast-export: add --no-data option
5041 Giuseppe Bilotta (3):
5042 gitweb: fix 'Use of uninitialized value' error in href()
5043 git apply: option to ignore whitespace differences
5044 gitweb: pull ref markes pull out of subject <a> element
5047 cvsimport: add test illustrating a bug in cvsps
5048 cvsimport: extend testcase about patchset order to contain branches
5049 remove logical typo in documentation of sample update hook
5050 web--browse: fix Mac OS X GUI detection for 10.6
5052 Ingmar Vanhassel (1):
5053 import-tars: Add missing closing bracket
5056 gitweb: Make .error style generic
5057 gitweb: Mark boundary commits in 'blame' view
5058 gitweb: Use "previous" header of git-blame -p in 'blame' view
5059 gitweb: Mark commits with no "previous" in 'blame' view
5060 gitweb: Add author initials in 'blame' view, a la "git gui blame"
5061 gitweb: Use light/dark for class names also in 'blame' view
5064 git-tag(1): Refer to git-check-ref-format(1) for <name>
5065 Improve --patch option documentation in git-add
5068 push: add --quiet flag
5069 transport: pass "quiet" flag to pack-objects
5070 transport: don't show push status if --quiet is given
5071 Makefile: git-http-fetch does not need expat
5072 tests: use "$TEST_DIRECTORY" instead of ".."
5073 tests: provide $TRASH_DIRECTORY variable
5074 tests: allow user to specify trash directory location
5075 t/Makefile: include config.mak
5076 allow pull --rebase on branch yet to be born
5077 tests: disable interactive hunk selection tests if perl is not available
5078 clone: add --branch option to select a different HEAD
5079 refactor test-date interface
5080 tests: add date printing and parsing tests
5081 fix approxidate parsing of relative months and years
5082 push: teach --quiet to suppress "Everything up-to-date"
5083 push: make non-fast-forward help message configurable
5084 status: make "how to stage" messages optional
5085 rebase: use plumbing to show dirty state
5086 improve reflog date/number heuristic
5087 pull: improve advice for unconfigured error case
5090 Check return value of ftruncate call in http.c
5093 git submodule summary: add --files option
5096 use write_str_in_full helper to avoid literal string lengths
5097 use write_str_in_full helper to avoid literal string lengths
5098 don't dereference NULL upon fdopen failure
5099 pre-commit.sample: add comment re tr portability; fix grammar
5100 typo fix: Directory `...' exist, ...: s/exist/exists/
5103 git submodule foreach: Provide access to submodule name, as '$name'
5104 git submodule: Cleanup usage string and add option parsing to cmd_foreach()
5105 Add selftest for 'git submodule foreach'
5106 git submodule foreach: test access to submodule name as '$name'
5107 git submodule foreach: Add --recursive to recurse into nested submodules
5108 git submodule update: Introduce --recursive to update nested submodules
5109 git submodule status: Add --recursive to recurse into nested submodules
5110 t7407: Use 'rev-parse --short' rather than bash's substring expansion notation
5111 git clone: Add --recursive to automatically checkout (nested) submodules
5114 Fix '--relative-date'
5116 Johannes Gilger (1):
5117 git-clone doc: typofix
5119 Johannes Schindelin (2):
5120 Make 'git stash -k' a short form for 'git stash save --keep-index'
5121 parse-opt: optionally show "--no-" option string
5124 MinGW: simplify waitpid() emulation macros
5125 run_command: return exit code as positive value
5126 run_command: report system call errors instead of returning error codes
5127 run_command: encode deadly signal number in the return value
5128 run_command: report failure to execute the program, but optionally don't
5129 receive-pack: remove unnecessary run_status report
5130 api-run-command.txt: describe error behavior of run_command functions
5131 t0001-init: fix a file name
5132 t0001-init: split the existence test from the permission test
5133 gitk: Do not hard-code "encoding" in attribute lookup functions
5134 Make test number t7406- unique
5135 Make test case number unique
5136 status: list unmerged files much later
5137 start_command: do not clobber cmd->env on Windows code path
5138 pager: set LESS=FRSX also on Windows
5139 test-genrandom: ensure stdout is set to _O_BINARY on Windows
5141 Jonathan Nieder (8):
5142 Describe DOCBOOK_XSL_172, ASCIIDOC_NO_ROFF options in Makefile
5143 Documentation: git fmt-merge-msg does not have to be a script
5144 Documentation: clarify mergeoptions description
5145 Documentation: branch: update --merged description
5146 Documentation: clarify branch creation
5147 Documentation: clarify "working tree" definition
5148 racy-git.txt: explain nsec problem in more detail
5149 Documentation: clone: clarify discussion of initial branch
5152 Wrap rewrite globals in a struct in preparation for adding another set
5153 Add url.<base>.pushInsteadOf: URL rewriting for push only
5155 Junio C Hamano (47):
5156 t/t9600: remove exit after test_done
5158 request-pull: optionally show a patch as well
5159 diff-index: report unmerged new entries
5160 diff-index: keep the original index intact
5161 Allow mailsplit (and hence git-am) to handle mails with CRLF line-endings
5162 wt-status.c: rework the way changes to the index and work tree are summarized
5163 git-rev-list.txt: Clarify the use of multiple revision arguments
5164 block-sha1: undo ctx->size change
5165 block-sha1: minor fixups
5166 am: allow individual e-mail files as input
5167 status: show worktree status of conflicted paths separately
5168 Makefile: do not link three copies of git-remote-* programs
5169 Makefile: install hardlinks for git-remote-<scheme> supported by libcurl if possible
5170 verify-pack --stat-only: show histogram without verifying
5172 wt-status: move many global settings to wt_status structure
5173 wt-status: move wt_status_colors[] into wt_status structure
5174 Make git_status_config() file scope static to builtin-commit.c
5175 wt-status: collect untracked files in a separate "collect" phase
5176 Documentation/git-commit.txt: describe --dry-run
5177 git commit --dry-run -v: show diff in color when asked
5178 compat/snprintf.c: clarify SNPRINTF_SIZE_CORR
5179 builtin-mailinfo.c: fix confusing internal API to mailinfo()
5180 Teach mailinfo to ignore everything before -- >8 -- mark
5181 am/mailinfo: Disable scissors processing by default
5182 mailinfo.scissors: new configuration
5183 Draft release notes to 1.6.5 before -rc0
5184 upload-pack: add a trigger for post-upload-pack hook
5185 upload-pack: feed "kind [clone|fetch]" to post-upload-pack hook
5186 builtin-pack-objects.c: avoid vla
5187 builtin-apply.c: get rid of an unnecessary use of temporary array
5189 merge-recursive: give less scary messages when merge did not start
5190 Makefile: remove remnant of separate http/https/ftp helpers
5191 quiltimport documentation: --dry-run and -n are synonyms
5193 git-commit doc: remove duplicated --dry-run description
5194 Update Release Notes to 1.6.5
5195 pay attention to DESTDIR when building with NO_PERL_MAKEMAKER
5196 pull: Clarify "helpful" message for another corner case
5197 builtin-mailinfo.c: check error status from rewind and ftruncate
5198 show-branch: fix segfault when showbranch.default exists
5199 git-pull: dead code removal
5200 fast-import.c::validate_raw_date(): really validate the value
5201 Update draft release notes to 1.6.5
5205 git-svn: Use GIT_SSH setting if SVN_SSH is not set
5208 Documentaqtion/git-submodule.txt: Typofix
5209 git-log: allow --decorate[=short|full]
5211 Linus Torvalds (13):
5212 git-http-fetch: not a builtin
5213 Add new optimized C 'block-sha1' routines
5214 block-sha1: try to use rol/ror appropriately
5215 block-sha1: make the 'ntohl()' part of the first SHA1 loop
5216 block-sha1: re-use the temporary array as we calculate the SHA1
5217 block-sha1: macroize the rounds a bit further
5218 block-sha1: Use '(B&C)+(D&(B^C))' instead of '(B&C)|(D&(B|C))' in round 3
5219 block-sha1: get rid of redundant 'lenW' context
5220 block-sha1: perform register rotation using cpp
5221 block-sha1: improved SHA1 hashing
5222 block-sha1: improve code on large-register-set machines
5223 Improve on 'approxidate'
5224 Further 'approxidate' improvements
5227 git-p4: stream from perforce to speed up clones
5229 Marius Storm-Olsen (9):
5230 Add include guards to compat/win32.h
5231 Set _O_BINARY as default fmode for both MinGW and MSVC
5232 Add empty header files for MSVC port
5233 Make usage of windows.h lean and mean
5234 Define strncasecmp and ftruncate for MSVC
5235 Add MSVC to Makefile
5236 Add README for MSVC build
5237 Add scripts to generate projects for other buildsystems (MSVC vcproj, QMake)
5238 Tag GIT_VERSION when Git is built with MSVC
5241 gitweb: support to globally disable a snapshot format
5242 gitweb: update INSTALL regarding specific snapshot settings
5243 gitweb: add support for XZ compressed snapshots
5246 gitweb: improve snapshot error handling
5247 gitweb: split test suite into library and tests
5248 gitweb: add t9501 tests for checking HTTP status codes
5249 tests: make all test files executable
5251 Martin Nordholts (1):
5252 git.el: Use git-add-file for unmerged files, remove git-resolve-file
5255 rebase: consistent error messages for staged and unstaged changes.
5256 git-ls-files.txt: clarify what "other files" mean for --other
5257 Show usage string for 'git log -h', 'git show -h' and 'git diff -h'
5258 Rename REFRESH_SAY_CHANGED to REFRESH_IN_PORCELAIN.
5259 reset: make the reminder output consistent with "checkout"
5260 stash: simplify defaulting to "save" and reject unknown options
5261 wrap git's main usage string.
5262 push: Correctly initialize nonfastforward in transport_push.
5264 Michael Haggerty (6):
5265 Start a library for cvsimport-related tests
5266 Use CVS's -f option if available (ignore user's ~/.cvsrc file)
5267 Test contents of entire cvsimported "master" tree contents
5268 Add some tests of git-cvsimport's handling of vendor branches
5269 Add a test of "git cvsimport"'s handling of tags and branches
5270 git-svn: ignore leading blank lines in svn:ignore
5272 Michael J Gruber (3):
5273 t6010-merge-base.sh: Depict the octopus test graph
5274 git-merge-base/git-show-branch: Cleanup documentation and usage
5275 git-merge-base/git-show-branch --merge-base: Documentation and test
5278 generators/vcproj.pm: remove UNICODE from build
5280 Michał Kiedrowicz (2):
5281 init-db: migrate to parse-options
5282 grep: Add --max-depth option.
5285 Add transport native helper executables to .gitignore
5286 http-fetch: Fix Makefile dependancies
5289 git branch -D: give a better error message when lockfile creation fails
5291 Nanako Shiraishi (3):
5292 git init: optionally allow a directory argument
5293 Documentation: consistently refer to check-ref-format
5294 Documentation: describe the scissors mark support of "git am"
5297 git-push: Accept -n as a synonym for --dry-run.
5299 Nguyễn Thái Ngọc Duy (1):
5300 Prevent diff machinery from examining assume-unchanged entries on worktree
5303 Shift object enumeration out of upload-pack
5306 block-sha1: move code around
5307 block-sha1: split the different "hacks" to be individually selected
5308 block-sha1: support for architectures with memory alignment restrictions
5309 block-sha1: more good unaligned memory access candidates
5310 block-sha1: make the size member first in the context struct
5311 make sure byte swapping is optimal for git
5312 block-sha1: guard gcc extensions with __GNUC__
5313 remove ARM and Mozilla SHA1 implementations
5314 fix simple deepening of a repo
5315 make shallow repository deepening more network efficient
5316 pack-objects: free preferred base memory after usage
5317 Nicolas Pitre has a new email address
5318 make 'git clone' ask the remote only for objects it cares about
5320 Nicolas Sebrecht (3):
5321 git-am: print fair error message when format detection fails
5322 mailinfo: add '--scissors' to usage message
5323 add documentation for mailinfo.scissors and '--no-scissors'
5326 git stash: Give friendlier errors when there is nothing to apply
5329 Do not scramble password read from .cvspass
5332 gitk: Work around leftover temporary save file
5335 gitk: Show diff of commits at end of compare-commits output
5338 gitk: Update Swedish translation (280t0f0u)
5339 import-tars: Allow per-tar author and commit message.
5340 Add script for importing bits-and-pieces to Git.
5342 Ramsay Allan Jones (3):
5343 Fix some printf format warnings
5344 Fix MSVC build on cygwin
5345 Fix the exit code of MSVC build scripts on cygwin
5348 git-p4: Avoid modules deprecated in Python 2.6.
5351 update-server-info: make builtin, use parseopt
5352 UI consistency: allow --force for where -f means force
5353 Git archive and trailing "/" in prefix
5356 bash: rename __git_find_subcommand() to __git_find_on_cmdline()
5357 bash: update 'git stash' completion
5358 bash: teach 'git reset --patch'
5359 bash: teach 'git checkout' options
5361 Sebastian Schuberth (2):
5362 Make generated MSVC solution file open from Windows Explorer
5363 Make just opening the generated MSVC solution file not modify it
5366 git-svn: hide find_parent_branch output in double quiet mode
5369 README: git lives at http://git-scm.com these days
5372 read-tree: convert unhelpful usage()'s to helpful die()'s
5373 read-tree: migrate to parse-options
5374 write-tree: migrate to parse-options
5375 verify-tag: migrate to parse-options
5376 verify-pack: migrate to parse-options
5377 prune-packed: migrate to parse-options
5378 technical-docs: document tree-walking API
5379 completion: update am, commit, and log
5380 completion: add dirstat and friends to diff options
5381 completion: fix completion of git <TAB><TAB>
5382 completion: fix alias listings with newlines
5385 http.c: free preq when aborting
5386 http.c: replace usage of temporary variable for urls
5388 Thadeu Lima de Souza Cascardo (1):
5389 Translate the tutorial to Brazillian Portuguese
5392 Update the usage bundle string.
5393 pack-objects: remove SP at the end of usage string
5394 Update "describe" documentation to match reality
5397 Document 'stash clear' recovery via unreachable commits
5398 gitk: New option to hide remote refs
5399 gitk: Fix direction of symmetric difference in optimized mode
5400 gitk: Parse arbitrary commit-ish in SHA1 field
5401 git-apply--interactive: Refactor patch mode code
5402 Add a small patch-mode testing library
5403 builtin-add: refactor the meat of interactive_add()
5404 Implement 'git reset --patch'
5405 Implement 'git checkout --patch'
5406 Implement 'git stash save --patch'
5407 DWIM 'git stash save -p' for 'git stash -p'
5410 completion: Replace config --list with --get-regexp
5413 git-svn.txt: Fix location of parent argument
5415 Wesley J. Landaker (2):
5416 Documentation: git-send-email: fix submission port number
5417 Documentation: git-send-email: correct statement about standard ports
5420 Add support for the Mongoose web server.
5423 send-email: fix obscure error when encryption=tls and smtp cannot connect
5426 Version v1.6.4.4; changes since v1.6.4.3:
5427 -----------------------------------------
5430 checkout: do not imply "-f" on unborn branches
5433 Fix "unpack-objects --strict"
5434 check_path(): allow symlinked directories to checkout-index --prefix
5435 xutils: Fix hashing an incomplete line with whitespaces at the end
5436 xutils: Fix xdl_recmatch() on incomplete lines
5437 http.c: avoid freeing an uninitialized pointer
5441 Version v1.6.4.3; changes since v1.6.4.2:
5442 -----------------------------------------
5445 githooks.txt: put hooks into subsections
5447 Clemens Buchacher (2):
5448 grep: fix exit status if external_grep() punts
5449 grep: accept relative paths outside current working directory
5451 Emmanuel Trillaud (1):
5452 git-pull: do not mention --quiet and --verbose twice
5455 git-cvsserver: no longer use deprecated 'git-subcommand' commands
5458 clone: disconnect transport after fetching
5459 push: fix english in non-fast-forward message
5460 push: re-flow non-fast-forward message
5466 svn: properly escape arguments for authors-prog
5469 git-clone: add missing comma in --reference documentation
5472 http.c: remove verification of remote packs
5475 Version v1.6.4.2; changes since v1.6.4.1:
5476 -----------------------------------------
5479 Minor improvement to the write-tree documentation
5482 Round-down years in "years+months" relative date view
5485 add tests for merge message headings
5486 merge: fix incorrect merge message for ambiguous tag/branch
5487 merge: indicate remote tracking branches in merge message
5489 Johannes Schindelin (2):
5490 Expose the has_non_ascii() function
5491 Correctly mark cover letters' encodings if they are not pure ASCII
5494 t6035-merge-dir-to-symlink depends on SYMLINKS prerequisite
5497 apply: notice creation/removal patches produced by GNU diff
5498 clean: require double -f options to nuke nested git repository and work tree
5502 git add -p: demonstrate failure when staging both mode and hunk
5505 lstat_cache: guard against full match of length of 'name' parameter
5508 git-log: allow --decorate[=short|full]
5511 git-checkout: be careful about untracked symlinks
5513 Nanako Shiraishi (3):
5514 git-bisect: call the found commit "*the* first bad commit"
5515 Fix overridable written with an extra 'e'
5516 Remove unused t/t8005/iso8859-5.txt
5518 Pickens, James E (1):
5519 Demonstrate bugs when a directory is replaced with a symlink
5522 http.c: don't assume that urls don't end with slash
5523 http.c: set slot callback members to NULL when releasing object
5526 add -p: do not attempt to coalesce mode changes
5528 Wesley J. Landaker (1):
5529 Documentation: git-archive: mark --format as optional in summary
5532 Version v1.6.4.1; changes since v1.6.4:
5533 ---------------------------------------
5535 Björn Steinbrink (1):
5536 config: Keep inner whitespace verbatim
5539 send-email: remove debug trace
5542 gitweb/README: Document $base_url
5545 show: suppress extra newline when showing annotated tag
5546 show: add space between multiple items
5547 docs: describe impact of repack on "clone -s"
5550 Documentation: git submodule: add missing options to synopsis
5553 help.c: give correct structure's size to memset()
5555 Johannes Schindelin (1):
5556 filter-branch: add an example how to add ACKs to a range of commits
5559 merge-recursive: don't segfault while handling rename clashes
5560 t5510: harden the way verify-pack is used
5561 verify-pack -v: do not report "chain length 0"
5562 am: allow individual e-mail files as input
5566 git-instaweb: fix mod_perl detection for apache2
5569 Better usage string for reflog.
5570 push: point to 'git pull' and 'git push --force' in case of non-fast forward
5571 filter-branch: make the usage string fit on 80 chars terminals.
5574 hg-to-git: don't import the unused popen2 module
5577 don't let the delta cache grow unbounded in 'git repack'
5579 Nicolas Sebrecht (1):
5580 git-am: print fair error message when format detection fails
5583 Change mentions of "git programs" to "git commands"
5586 Documentation: merge: one <remote> is required
5587 Documentation: add: <filepattern>... is optional
5590 t5520-pull: Test for rebased upstream + fetch + pull --rebase
5591 pull: support rebased upstream + fetch + pull --rebase
5594 gitweb: parse_commit_text encoding fix
5597 Fix typos in git-remote.txt and git-symbolic-ref.txt
5600 Version v1.6.4; changes since v1.6.3.4:
5601 ---------------------------------------
5604 Add -k option to cvsexportcommit to revert expanded CVS keywords in CVS working tree before applying commit patch
5607 Quote LF in urls git fetch saves in FETCH_HEAD
5608 Use UTF-8 instead of utf8 for backward compatibility
5609 Improve the naming of guessed target repository for git clone
5612 git-svn: Fix for svn paths removed > log-window-size revisions ago
5613 git-svn: Correctly report max revision when following deleted paths
5614 git-svn: Set svn.authorsfile if it is passed to git svn clone
5615 Make section_name_match start on '[', and return the length on success
5616 After renaming a section, print any trailing variable definitions
5619 graph API: Use horizontal lines for more compact graphs
5621 Andreas Ericsson (2):
5622 fetch: Strip usernames from url's before storing them
5623 mailinfo: Remove only one set of square brackets
5626 Add 'git svn help [cmd]' which works outside a repo.
5627 git-svn: speed up find_rev_before
5628 Add 'git svn reset' to unwind 'git svn fetch'
5630 Benjamin Kramer (1):
5631 imap-send: add support for IPv6
5634 builtin-remote: (get_one_entry): use strbuf
5636 Björn Steinbrink (2):
5637 git-apply(1): Clarify that one can select where to apply the patch
5638 Add a test showing that 'git repack' throws away grafted-away parents
5641 t3900: use ancient iconv names for backward compatibility
5642 Use 'UTF-8' rather than 'utf-8' everywhere for backward compatibility
5643 builtin-mailinfo.c: compare character encodings case insensitively
5644 builtin-mailinfo.c: use "ISO8859-1" instead of "latin1" as fallback encoding
5645 t3901: avoid negation on right hand side of '|'
5646 t3901: Use ISO8859-1 instead of ISO-8859-1 for backward compatibility
5647 t9301: use ISO8859-1 rather than ISO-8859-1
5648 t5100: use ancient encoding syntax for backwards compatibility
5649 t8005: use more portable character encoding names
5650 t8005: convert CP1251 character set to ISO8859-5
5651 t8005: fix typo, it's ISO-8859-5, not KOI8-R
5652 Makefile: use /usr/ucb/install on SunOS platforms rather than ginstall
5653 Makefile: add NEEDS_RESOLV to optionally add -lresolv to compile arguments
5654 On Solaris choose the OLD_ICONV iconv() declaration based on the UNIX spec
5655 git-compat-util.h: tweak the way _XOPEN_SOURCE is set on Solaris
5656 Makefile: define __sun__ on SunOS
5657 Makefile: add section for SunOS 5.7
5658 git-compat-util.h: avoid using c99 flex array feature with Sun compiler 5.8
5659 git-send-email.perl: improve detection of MIME encoded-words
5660 send-email: use UTF-8 rather than utf-8 for consistency
5661 Makefile: Solaris needs HAVE_ALLOCA_H for alloca()
5662 t/t9001-send-email.sh: ensure generated script is executed with $SHELL_PATH
5663 git.c: avoid allocating one-too-many elements for new argv array
5664 unpack-trees.c: work around run-time array initialization flaw on IRIX 6.5
5665 git-compat-util.h: adjust for SGI IRIX 6.5
5666 Makefile: add NEEDS_LIBGEN to optionally add -lgen to compile arguments
5667 Makefile: add section for SGI IRIX 6.5
5668 Makefile: update IRIX64 section
5669 configure.ac: rework/fix the NEEDS_RESOLV and NEEDS_LIBGEN tests
5670 configure.ac: properly unset NEEDS_SSL_WITH_CRYPTO when sha1 func is missing
5672 Christian Couder (30):
5673 rev-list: make "estimate_bisect_steps" non static
5674 rev-list: refactor printing bisect vars
5675 bisect: move common bisect functionality to "bisect_common"
5676 bisect--helper: add "--next-exit" to output bisect results
5677 bisect: use "git bisect--helper --next-exit" in "git-bisect.sh"
5678 bisect--helper: remove "--next-vars" option as it is now useless
5679 rev-list: remove stringed output flag from "show_bisect_vars"
5680 rev-parse: add --sq-quote to shell quote arguments
5681 bisect: use "git rev-parse --sq-quote" instead of a custom "sq" function
5682 am: simplify "sq" function by using "git rev-parse --sq-quote"
5683 bisect: use "sha1_array" to store skipped revisions
5684 bisect: implement "rev_argv_push" to fill an argv with revs
5685 bisect: store good revisions in a "sha1_array"
5686 bisect: use new "struct argv_array" to prepare argv for "setup_revisions"
5687 bisect: remove too much function nesting
5688 bisect: make skipped array functions more generic
5689 bisect: automatically sort sha1_array if needed when looking it up
5690 bisect: implement the "check_merge_bases" function
5691 bisect: add "check_good_are_ancestors_of_bad" function
5692 bisect: make "git bisect" use new "--next-all" bisect-helper function
5693 bisect: rework some rev related functions to make them more reusable
5694 commit: add function to unparse a commit and its parents
5695 bisect: check ancestors without forking a "git rev-list" process
5696 bisect: drop unparse_commit() and use clear_commit_marks()
5697 bisect: display first bad commit without forking a new process
5698 bisect: add parameters to "filter_skipped"
5699 bisect: when skipping, choose a commit away from a skipped commit
5700 t6030: test skipping away from an already skipped commit
5701 bisect: use a PRNG with a bias when skipping away from untestable commits
5702 Documentation: remove warning saying that "git bisect skip" may slow bisection
5704 Christian Stimming (1):
5705 gitk: Update German translation.
5707 Clemens Buchacher (5):
5708 http-push: reuse existing is_null_ref
5709 match_refs: search ref list tail internally
5710 test-lib: fail if invalid options are passed
5711 test-lib: allow exit trap to be used for cleanup by tests
5712 test-lib: fix http exit codes
5715 Unify signedness in hashing calls
5717 Daniel Trstenjak (2):
5718 Show presence of stashed changes in bash prompt.
5719 Show the presence of untracked files in the bash prompt.
5722 mergetool--lib: specialize diff options for emerge and ecmerge
5723 mergetool--lib: add support for araxis merge
5724 compat: add a mkstemps() compatibility function
5725 compat: add a basename() compatibility function
5726 diff: generate pretty filenames in prep_temp_blob()
5729 Update the documentation of the raw diff output format
5732 gitk: Add option 'Simple history' to the options menu
5735 connect.c: Support PuTTY plink and TortoisePlink as SSH on Windows
5738 gitk: Make more options easily accessible from Edit View dialog
5739 fast-export: Set revs.topo_order before calling setup_revisions
5740 fast-export: Omit tags that tag trees
5741 fast-export: Make sure we show actual ref names instead of "(null)"
5742 fast-export: Do parent rewriting to avoid dropping relevant commits
5743 fast-export: Add a --tag-of-filtered-object option for newly dangling tags
5744 Add new fast-export testcases
5745 fast-export: Document the fact that git-rev-list arguments are accepted
5747 Eric W. Biederman (1):
5748 git-send-email: Handle quotes when parsing .mailrc files
5751 git-svn: refuse to dcommit non-UTF-8 messages
5752 git-svn: convert globs to regexps for branch destinations
5753 t9138: remove stray dot in test which broke bash
5754 Allow the Unix epoch to be a valid commit date
5755 git svn: allow uppercase UUIDs from SVN
5756 git svn: rename tests that had conflicting numbers
5757 git svn: fix reparenting when ugly http(s) URLs are used
5758 git svn: fix shallow clone when upstream revision is too new
5759 git svn: revert default behavior for --minimize-url
5760 git svn: the branch command no longer needs the full path
5761 t9142: stop httpd after the test
5762 git svn: avoid escaping '/' when renaming/copying files
5763 git svn: make minimize URL more reliable over http(s)
5764 t9143: do not fail if Compress::Zlib is missing
5766 Eygene Ryabinkin (1):
5767 git-svn testsuite: use standard configuration for Subversion tools
5769 Felipe Contreras (2):
5770 Change prettify_ref to prettify_refname
5771 Prettify log decorations even more
5773 Frank Lichtenheld (2):
5774 Git.pm: Set GIT_WORK_TREE if we set GIT_DIR
5775 Git.pm: Always set Repository to absolute path if autodetecting
5777 Giuseppe Bilotta (11):
5778 git-am foreign patch support: introduce patch_format
5779 git-am foreign patch support: autodetect some patch formats
5780 git-am foreign patch support: StGIT support
5781 git-am: refactor 'cleaning up and aborting'
5782 gitweb: refactor author name insertion
5783 gitweb: uniform author info for commit and commitdiff
5784 gitweb: use git_print_authorship_rows in 'tag' view too
5785 gitweb: (gr)avatar support
5786 gitweb: gravatar url cache
5787 gitweb: picon avatar provider
5788 gitweb: add empty alt text to avatar img
5791 Fix rebase -p --onto
5794 Extend sample update hook, disable modifying of existing tags
5795 Extend sample pre-commit hook to check for non ascii filenames
5797 Hunter, D. Seth (1):
5798 http-push: fix xml_entities() string parsing overrun
5800 Jakub Narebski (10):
5801 gitweb: Remove function prototypes (cleanup)
5802 gitweb: Do not use bareword filehandles
5803 gitweb: Always use three argument form of open
5804 gitweb: Always use three argument form of open
5805 gitweb: Use block form of map/grep in a few cases more
5806 gitweb: Replace wrongly added tabs with spaces
5807 gitweb: Use capturing parentheses only when you intend to capture
5808 gitweb: Simplify snapshot format detection logic in evaluate_path_info
5809 gitweb: Remove unused $hash_base parameter from normalize_link_target
5810 gitweb: Sanitize title attribute in format_subject_html
5813 parseopt: add OPT_NEGBIT
5814 convert bare readlink to strbuf_readlink
5815 git-add: no need for -f when resolving a conflict in already tracked path
5816 Makefile: refactor regex compat support
5817 Makefile: use compat regex on Solaris
5818 log-tree: fix confusing comment
5819 Makefile: install 'git' in execdir
5820 send-email: detect cycles in alias expansion
5823 post-receive-email: hooks.showrev: show how to include both web link and patch
5824 avoid NULL dereference on failed malloc
5827 Rename submodule.<name>.rebase to submodule.<name>.update
5828 git-submodule: add support for --merge.
5829 quickfetch(): Prevent overflow of the rev-list command line
5831 Johannes Schindelin (13):
5832 git-add: introduce --edit (to edit the diff vs. the index)
5833 t3702: fix reliance on SHELL_PATH being '/bin/sh'
5834 MinGW: the path separator to split GITPERLLIB is ';' on Win32
5835 MinGW: use POSIX signature of waitpid()
5836 MinGW: Add a simple getpass()
5837 MinGW: Fix compiler warning in merge-recursive
5838 MinGW: GCC >= 4 does not need SNPRINTF_SIZE_CORR anymore
5839 Quiet make: do not leave Windows behind
5840 Work around a regression in Windows 7, causing erase_in_line() to crash sometimes
5841 test-chmtime: work around Windows limitation
5842 MinGW: fix warning about implicit declaration of _getch()
5843 Fix warnings in nedmalloc when compiling with GCC 4.4.0
5844 git repack: keep commits hidden by a graft
5847 gitk: Use --textconv to generate diff text
5848 Simplify some instances of run_command() by using run_command_v_opt().
5849 Simplify some 'fprintf(stderr); return -1;' by using 'return error()'
5850 Fix typo in nedmalloc warning fix
5851 compat/ has subdirectories: do not omit them in 'make clean'
5852 daemon: send stderr of service programs to the syslog
5853 upload-pack: squelch progress indicator if client cannot see it
5854 receive-pack: do not send error details to the client
5855 git-mv: fix directory separator treatment on Windows
5856 MinGW: truncate exit()'s argument to lowest 8 bits
5859 mktree --missing: updated usage message and man page
5860 mktree --batch: build more than one tree object
5861 mktree: validate entry type in input
5863 Junio C Hamano (29):
5864 Start 1.6.4 development
5866 mktree: use parse-options
5867 builtin-mktree.c: use a helper function to handle one line of input
5868 mktree: do not barf on a submodule commit
5869 t1010: add mktree test
5870 mktree --missing: allow missing objects
5871 t3900: ISO-2022-JP has more than one popular variants
5872 write-tree --ignore-cache-tree
5873 Teach Solaris that _XOPEN_SOURCE=600 really menas XPG6
5874 OpenSolaris 200811 (SunOS 5.11) does not want OLD_ICONV
5875 cache-tree.c::cache_tree_find(): simplify internal API
5876 t4007: modernize the style
5877 Optimize "diff-index --cached" using cache-tree
5878 Avoid "diff-index --cached" optimization under --find-copies-harder
5879 Update draft release notes to 1.6.4
5880 completion: fix PS1 display during an AM on detached HEAD
5881 Documentation/git.txt: update links to release notes
5882 Makefile: introduce SANE_TOOL_PATH for prepending required elements to PATH
5883 Makefile: test-parse-options depends on parse-options.h
5884 Makefile: insert SANE_TOOL_PATH to PATH before /bin or /usr/bin
5885 die_errno(): double % in strerror() output just in case
5886 Makefile: keep "git" when bindir is execdir
5887 Revert "mailinfo: Remove only one set of square brackets"
5888 push: do not give big warning when no preference is configured
5889 Updates to draft release notes to 1.6.4
5890 Update release notes for 1.6.4
5895 symlinks.c: small style cleanup
5898 add --porcelain option to git-push
5900 Linus Torvalds (13):
5901 Clean up and simplify rev_compare_tree()
5902 Fix various sparse warnings in the git source code
5903 git log: add '--merges' flag to match '--no-merges'
5904 Add 'fill_directory()' helper function for directory traversal
5905 Simplify read_directory[_recursive]() arguments
5906 Avoid doing extra 'lstat()'s for d_type if we have an up-to-date cache entry
5907 Avoid using 'lstat()' to figure out directories
5908 Prepare symlink caching for thread-safety
5909 Export thread-safe version of 'has_symlink_leading_path()'
5910 Make index preloading check the whole path to the file
5911 Make 'git show' more useful
5912 Improve on the 'invalid object' error message at commit time
5913 Fix extraneous lstat's in 'git checkout -f'
5916 git svn: Support multiple branch and tag paths in the svn repository.
5917 git svn: cleanup t9138-multiple-branches
5918 git svn: Doc update for multiple branch and tag paths
5920 Marius Storm-Olsen (2):
5921 MinGW readdir reimplementation to support d_type
5922 Add custom memory allocator to MinGW and MacOS builds
5925 git-svn: add --authors-prog option
5926 http.c: prompt for SSL client certificate password
5927 http.c: add http.sslCertPasswordProtected option
5929 Markus Heidelberg (10):
5930 show-branch: color the commit status signs
5931 bash completion: show-branch color support
5932 diff: do not color --stat output like patch context
5933 gitk: Allow diff view without context lines
5934 add a test for git-send-email for non-threaded mails
5935 send-email: fix non-threaded mails
5936 doc/send-email: clarify the behavior of --in-reply-to with --no-thread
5937 add a test for git-send-email for threaded mails without chain-reply-to
5938 send-email: fix threaded mails without chain-reply-to
5939 send-email: fix a typo in a comment
5942 git stash: modernize use of "dashed" git-XXX calls
5945 Remove filename from conflict markers
5947 Mattias Nissler (2):
5948 git-svn: Always duplicate paths returned from get_log
5949 git-svn: Fix branch detection when repository root is inaccessible
5951 Michael J Gruber (11):
5952 Documentation: clarify / requirement in 'git check-ref-format'
5953 Test tracking of non-commit upstreams
5954 Fix behavior with non-commit upstream references
5955 Allow push and fetch urls to be different
5956 t5516: Check pushurl config setting
5957 technical/api-remote: Describe new struct remote member pushurl
5958 git-repack.txt: Clarify implications of -a for dumb protocols
5959 builtin-remote: Show push urls as well
5960 builtin-remote: Make "remote -v" display push urls
5961 t4202-log.sh: Test git log --no-walk sort order
5962 git-rerere.txt: Clarify ambiguity of the config variable
5964 Michael S. Tsirkin (1):
5965 Add --reference option to git submodule.
5968 Docs: send-email: Put options back into alphabetical order
5969 Docs: send-email: Refer to CONFIGURATION section for sendemail.multiedit
5970 Docs: send-email: --smtp-server-port can take symbolic ports
5971 send-email: Handle "GIT:" rather than "GIT: " during --compose
5972 send-email: 'References:' should only reference what is sent
5973 send-email: Remove superfluous `my $editor = ...'
5976 apply: handle filenames with double slashes better
5978 Michele Ballabio (1):
5979 gitk: Add another string to translation
5982 Don't expect verify_pack() callers to set pack_size
5983 transport.c::get_refs_via_curl(): do not leak refs_url
5984 http.c: new functions for the http API
5985 transport.c::get_refs_via_curl(): use the new http API
5986 http.c::http_fetch_ref(): use the new http API
5987 http-push.c::remote_exists(): use the new http API
5988 http-push.c::fetch_symref(): use the new http API
5991 cvsexportcommit: reorder tests to quiet intermittent failure
5993 Nanako Shiraishi (1):
5994 Documentation/config.txt: a variable can be defined on the section header line
5996 Nguyễn Thái Ngọc Duy (3):
5997 doc/git-rebase.txt: remove mention of multiple strategies
5998 Terminate argv with NULL before calling setup_revisions()
5999 t/t3400-rebase.sh: add more tests to help migrating git-rebase.sh to C
6002 diff-tree -r -t: include added/removed directories in the output
6005 git-cvsexportcommit can't commit files which have been removed from CVS
6006 Remove archaic use of regex capture \1 in favour of $1
6007 Avoid generating a warning if $fullname{$file} is undefined
6010 Test cccmd in t9001-send-email.sh and fix some bugs
6013 gitk: Handle msysGit version during version comparisons
6014 git: browsing paths with spaces when using the start command
6017 gitk: Check git version before using --textconv flag
6020 MinGW: Scan for \r in addition to \n when reading shbang lines
6023 git-submodule: add support for --rebase.
6025 Pierre Habouzit (5):
6026 parse-options: add parse_options_check to validate option specs.
6027 janitor: use NULL and not 0 for pointers.
6028 refactor: use bitsizeof() instead of 8 * sizeof()
6029 janitor: add DIV_ROUND_UP and use it.
6030 janitor: useless checks before free
6032 Ralf Wildenhues (1):
6033 configure: test whether -lresolv is needed
6036 parseopt: add OPT_NEGBIT
6037 parseopt: add OPT_NUMBER_CALLBACK
6038 parseopt: add PARSE_OPT_NODASH
6039 grep: remove global variable builtin_grep
6041 grep: make callback functions static
6042 userdiff: add xdiff_clear_find_func()
6043 grep: move context hunk mark handling into show_line()
6044 grep: print context hunk marks between files
6045 grep: handle pre context lines on demand
6046 grep: add option -p/--show-function
6047 grep -p: support user defined regular expressions
6048 grep: simplify -p output
6050 Robert Allan Zeh (1):
6051 git svn: add gc command
6053 Robin Rosenberg (1):
6054 Disallow '\' in ref names
6057 bash: remove always true if statement from __git_ps1()
6058 Documentation: mention 'git stash pop --index' option explicitly
6059 bash: add support for 'git stash pop --index' option
6060 Document 'git (rev-list|log) --merges'
6061 bash: add '--merges' to common 'git log' options
6064 parse-remote: function to get the tracking branch to be merge
6065 parse-remote: support default reflist in get_remote_merge_branch
6066 parse-remote: remove unused functions
6068 Sean Estabrooks (1):
6069 Trivial path quoting fixes in git-instaweb
6071 Sitaram Chamarty (1):
6072 allow -t abbreviation for --track in git branch
6074 Steffen Prohaska (1):
6075 MinGW: Teach Makefile to detect msysgit and apply specific settings
6078 bash completion: complete variable names for "git config" with options
6079 format-patch: migrate to parse-options API
6080 parse-options: add PARSE_OPT_LITERAL_ARGHELP for complicated argh's
6081 show-branch: migrate to parse-options API
6082 parse-opts: prepare for OPT_FILENAME
6083 parse-opts: add OPT_FILENAME and transition builtins
6084 t5500: Modernize test style
6085 t9120: don't expect failure with SVN_HTTPD_PORT unset
6086 config.txt: document add.ignore-errors
6087 git-show-branch.txt: document --date-order option
6088 parse-options: make OPT_INTEGER's argh explicit
6089 parse-options: simplify usage argh handling
6090 show-branch: don't use LASTARG_DEFAULT with OPTARG
6091 t4150: test applying with a newline in subject
6092 am: suppress apply errors when using 3-way
6093 git-sh-setup: introduce say() for quiet options
6094 submodule, repack: migrate to git-sh-setup's say()
6095 am, rebase: teach quiet option
6096 stash: teach quiet option
6097 show-ref: migrate to parse-options
6098 completion: add missing config variables
6099 completion: __git_config_get_set_variables() handle values with spaces
6102 t5540-http-push: test fetching of loose objects
6103 t5540-http-push: test fetching of packed objects
6104 http-push: send out fetch requests on queue
6105 http-push: fix missing "#ifdef USE_CURL_MULTI" around "is_running_queue"
6106 t5550-http-fetch: test fetching of packed objects
6107 http-push, http-walker: style fixes
6108 http-walker: verify remote packs
6109 http*: copy string returned by sha1_to_hex
6110 http-push: do not SEGV after fetching a bad pack idx file
6111 http*: move common variables and macros to http.[ch]
6112 http: create function end_url_with_slash
6113 http*: add http_get_info_packs
6114 http: use new http API in fetch_index()
6115 http*: add helper methods for fetching packs
6116 http*: add helper methods for fetching objects (loose)
6119 Documentation: teach stash/pop workflow instead of stash/apply
6120 git-svn: let 'dcommit $rev' work on $rev instead of HEAD
6121 Introduce die_errno() that appends strerror(errno) to die()
6122 Convert existing die(..., strerror(errno)) to die_errno()
6123 Use die_errno() instead of die() when checking syscalls
6124 Disable asciidoc 8.4.1+ semantics for `{plus}` and friends
6127 completion: Add --full-diff to log options
6130 send-email: Add config option for sender address
6133 git-svn: Canonicalize svn urls to prevent libsvn assertion
6135 Uwe Kleine-König (2):
6136 more tests for git rev-parse --parse-opt
6137 parse-opt: make PARSE_OPT_STOP_AT_NON_OPTION available to git rev-parse
6139 Wincent Colaiuta (1):
6140 gitweb: update Git homepage URL
6143 git-svn.txt: stop using dash-form of commands.
6144 git-svn.txt: make formatting more consistent.
6145 git-svn.txt: fix fetch flags incorrectly documented as init flags.
6146 git-svn.txt: fix description of fetch flags accepted by clone.
6147 List send-email config options in config.txt.
6148 Improve doc for format-patch threading options.
6151 Version v1.6.3.4; changes since v1.6.3.3:
6152 -----------------------------------------
6155 refs.c: release file descriptor on error return
6156 sha1_name.c: avoid unnecessary strbuf_release
6159 git-remote: fix missing .uploadpack usage for show command
6161 Clemens Buchacher (1):
6162 fetch: do not create ref from empty name
6164 Giuseppe Bilotta (1):
6165 gitweb/README: fix AliasMatch in example
6168 t3700-add: add a POSIXPERM prerequisite to a new test
6169 Makefile: git.o depends on library headers
6172 request-pull: really disable pager
6173 checkout -f: deal with a D/F conflict entry correctly
6174 combine-diff.c: fix performance problem when folding common deleted lines
6175 diff --cc: a lost line at the beginning of the file is shown incorrectly
6176 do_one_ref(): null_sha1 check is not about broken ref
6177 SunOS grep does not understand -C<n> nor -e
6178 Fix severe breakage in "git-apply --whitespace=fix"
6179 t8005: Nobody writes Russian in shift_jis
6183 git branch: fix performance problem
6184 git branch: avoid unnecessary object lookups
6185 git branch: clean up detached branch handling
6187 Matthias Andree (1):
6188 Fix export_marks() error handling.
6191 request-pull: really really disable pager
6194 git-submodule documentation: fix foreach example
6197 attr: plug minor memory leak
6200 fread does not return negative on error
6203 Trailing whitespace and no newline fix
6205 Sitaram Chamarty (1):
6206 Documentation: update description of shell aliases
6209 add: allow configurations to be overriden by command line
6210 config.txt: document add.ignore-errors
6212 Thadeu Lima de Souza Cascardo (1):
6213 Makes some cleanup/review in gittutorial
6216 Test git archive --remote
6217 Test grep --and/--or/--not
6220 request-pull: allow ls-remote to notice remote.$nickname.uploadpack
6223 Version v1.6.3.3; changes since v1.6.3.2:
6224 -----------------------------------------
6227 for-each-ref: Do not lookup objects when they will not be used
6229 Clemens Buchacher (1):
6230 refuse to merge during a merge
6233 use xstrdup, not strdup in ll-merge.c
6235 Johannes Schindelin (1):
6236 import-tars: support symlinks
6239 fetch-pack: close output channel after sideband demultiplexer terminates
6240 diff.c: plug a memory leak in an error path
6243 t3505: fix abuse of test_expect_code
6244 attribute: whitespace set to true detects all errors known to git
6248 Fix big left-shifts of unsigned char
6251 fix handling of iconv configuration options
6254 http.c: fix compiling with libcurl 7.9.2
6256 Michael J Gruber (1):
6257 builtin-remote: Make "remote show" display all urls
6260 git-svn documentation: fix typo in 'rebase vs. pull/merge' section
6262 Nanako Shiraishi (1):
6263 .gitattributes: CR at the end of the line is an error
6266 Documentation: git-send-mail can take rev-list arg to drive format-patch
6267 avoid exponential regex match for java and objc function names
6270 upload-archive: fix infinite loop on Cygwin
6272 Shawn O. Pearce (1):
6273 daemon: Strictly parse the "extra arg" part of the command
6276 git-rerere.txt: grammatical fixups and cleanups
6277 pull, rebase: simplify to use die()
6278 git-show-ref.txt: remove word and make consistent
6281 http*: cleanup slot->local after fclose
6284 Documentation: refer to gitworkflows(7) from tutorial and git(1)
6286 Uwe Kleine-König (1):
6287 rebase--interactive: remote stray closing parenthesis
6290 Version v1.6.3.2; changes since v1.6.3.1:
6291 -----------------------------------------
6294 Introduce an unlink(2) wrapper which gives warning if unlink failed
6295 replace direct calls to unlink(2) with unlink_or_warn
6296 print unlink(2) errno in copy_or_link_directory
6297 Clarify kind of conflict in merge-one-file helper
6298 ls-tree manpage: use "unless" instead of "when ... is not"
6299 ls-tree manpage: output of ls-tree is compatible with update-index
6300 http-push.c::remove_locks(): fix use after free
6303 t6023: merge-file fails to output anything for a degenerate merge
6304 Change xdl_merge to generate output even for null merges
6306 Clemens Buchacher (1):
6307 fix segfault showing an empty remote
6310 Fix type-punning issues
6313 builtin-checkout: Don't tell user that HEAD has moved before it has
6316 merge-recursive: never leave index unmerged while recursing
6318 Giuseppe Bilotta (1):
6319 completion: use git rev-parse to detect bare repos
6322 fix GIT_TRACE segfault with shell-quoted aliases
6323 add: don't complain when adding empty project root
6324 for-each-ref: fix segfault in copy_email
6325 lock_ref: inform callers of unavailable ref
6326 fetch: report ref storage DF errors more accurately
6327 fix cat-file usage message and documentation
6330 format-patch let -k override a config-specified format.numbered
6331 pre-commit.sample: don't print incidental SHA1
6333 Johannes Schindelin (2):
6334 Add NO_CROSS_DIRECTORY_HARDLINKS support to the Makefile
6335 Cope better with a _lot_ of packs
6338 t3701: ensure correctly set up repository after skipped tests
6341 Revert "git-add--interactive: remove hunk coalescing"
6342 completion: fix PS1 display during a merge on detached HEAD
6343 completion: simplify "current branch" in __git_ps1()
6344 completion: enhance "current branch" display
6346 Update draft release notes for 1.6.3.2
6347 blame: correctly handle a path that used to be a directory
6351 Avoid unnecessary 'lstat()' calls in 'get_stat_data()'
6352 Teach 'git checkout' to preload the index contents
6353 dir.c: clean up handling of 'path' parameter in read_directory_recursive()
6356 Splitting a hunk that adds a line at the top fails in "add -p"
6358 Michael J Gruber (1):
6359 merge-options.txt: Clarify merge --squash
6361 Nanako Shiraishi (1):
6362 test: checkout shouldn't say that HEAD has moved if it didn't
6365 allow OFS_DELTA objects during a push
6368 grep: fix word-regexp colouring
6369 grep: fix word-regexp at the beginning of lines
6370 grep: fix colouring of matches with zero length
6371 grep: fix empty word-regexp matches
6374 api-parse-options.txt: use 'func' instead of 'funct'
6375 tests: Add tests for missing format-patch long options
6376 completion: add missing options to show-branch and show
6377 show-branch: Fix die message in parse_reflog_param()
6378 commit: -F overrides -t
6379 apply, fmt-merge-msg: use relative filenames
6382 Documentation: teach stash/pop workflow instead of stash/apply
6383 add -i: do not dump patch during application
6386 Turn on USE_ST_TIMESPEC for OpenBSD
6389 Version v1.6.3.1; changes since v1.6.3:
6390 ---------------------------------------
6393 Clarify kind of conflict in merge-one-file helper
6395 Alexander Potashev (1):
6396 Documentation: cloning to empty directory is allowed
6398 Felipe Contreras (1):
6399 git config: clarify --add and --get-color
6402 Start 1.6.3.1 maintenance series.
6403 archive-tar.c: squelch a type mismatch warning
6404 Revert "checkout branch: prime cache-tree fully"
6408 Version v1.6.3; changes since v1.6.3-rc4:
6409 -----------------------------------------
6412 improve error message in config.c
6415 dir.c: Fix two minor grammatical errors in comments
6418 Work around BSD whose typeof(tv.tv_sec) != time_t
6421 t4018-diff-funcname: add cpp xfuncname pattern to syntax test
6422 t8005: use egrep when extended regular expressions are required
6423 t4118: add missing '&&'
6424 t4118: avoid sed invocation on file without terminating newline
6425 t/annotate-tests.sh: avoid passing a non-newline terminated file to sed
6426 t4200: remove two unnecessary lines
6427 t4200: convert sed expression which operates on non-text file to perl
6432 git-clean doc: the command only affects paths under $(cwd)
6435 Nguyễn Thái Ngọc Duy (1):
6436 t4029: use sh instead of bash
6439 honor repack.usedeltabaseoffset when fetching packs
6441 Robin H. Johnson (1):
6442 git-svn: fix a sloppy Getopt::Long usage
6445 completion: add missing configuration variables to _git_config()
6446 completion: add {gui,diff,merge}tool, man, and pager config variables
6447 completion: complete values for help.format
6448 completion: complete values for log.date
6449 completion: complete values for send-email
6450 git-am.txt: add an 'a', say what 'it' is, simplify a sentence
6451 git-am.txt: Use date or value instead of time or timestamp
6452 git-am.txt: reword extra headers in message body
6455 Version v1.6.3-rc4; changes since v1.6.3-rc3:
6456 ---------------------------------------------
6459 git-gui: Update Russian translation
6460 improve error message in config.c
6461 gitk: Add Russian translation
6463 Alexander Gavrilov (3):
6464 git-gui: Fix post-commit status with subject in non-locale encoding
6465 git-gui: Avoid an infinite rescan loop in handle_empty_diff.
6466 git-gui: Support more git version notations.
6469 builtin-merge: fix a typo in an error message
6470 Documentation: fix a grammatical error in api-builtin.txt
6472 Benjamin Kramer (1):
6473 daemon.c: fix segfault on OS X
6475 Christian Stimming (1):
6476 gitk: Mark forgotten string for translation
6478 Daniel A. Steffen (2):
6479 gitk: Fixes for Mac OS X TkAqua
6480 git-gui: Fixes for Mac OS X TkAqua
6483 Makefile: installing git in cygwin 1.7.0
6484 doc: consistently use ASCIIDOC_EXTRA
6486 Felipe Contreras (2):
6487 git config: error when editing a repo config and not being in one
6488 Fix a bunch of pointer declarations (codestyle)
6491 git-gui: Ensure consistent usage of mergetool.keepBackup
6493 Giuseppe Bilotta (1):
6494 gitk: Provide a window icon if possible
6497 Makefile: fix NO_PERL bug with gitweb
6500 git-gui: Fix merge conflict display error when filename contains spaces
6501 git-gui: When calling post-commit hook wrong variable was cleared.
6502 git-gui: run post-checkout hook on checkout
6503 git-gui: run post-checkout hook after clone
6505 Joerg Bornemann (1):
6506 git-gui: fix use of undeclared variable diff_empty_count
6508 Johannes Schindelin (2):
6509 t5701: do not get stuck in empty-push/
6510 Rename core.unreliableHardlinks to core.createObject
6513 prune-packed: advanced progress even for non-existing fan-out directories
6516 diff -c -p: do not die on submodules
6517 merge-recursive: do not die on a conflicting submodule
6521 grep: fix segfault when "git grep '('" is given
6524 Add semicolon to curly brace group in main Makefile
6526 Markus Heidelberg (5):
6527 git-gui: don't hide the Browse button when resizing the repo chooser
6528 git-gui: fix deleting from the context menu with empty selection
6529 git-gui: use `git --html-path` to get the location of installed HTML docs
6530 git-gui (Win): make "Explore Working Copy" more robust
6531 git-gui (Win): make starting via "Git GUI Here" on .git/ possible
6533 Michele Ballabio (2):
6534 gitk: Mark some more strings for translation
6535 gitk: Map KP_Divide to focus the search box
6538 gitk: Handle blobs containing a DOS end-of-file marker
6539 gitk: Remember and restore the window state with the geometry
6540 gitk: Handle external diff tool with spaces in the path
6541 gitk: Avoid crash if closed while reading references
6544 NetBSD compilation fix
6547 gitk: Add a way to mark a commit, plus a "find descendant" command
6548 gitk: Add a command to compare two strings of commits
6549 gitk: Make .gitk a hidden file under windows
6550 gitk: Fix compare-commits function when we have local changes
6553 Append ampersand to "Target" of lnk files created by do_cygwin_shortcut
6556 ctype.c: fix typo in comment
6559 git-gui: various French translation fixes
6560 git-gui: minor spelling fix and string factorisation.
6563 SubmittingPatches: itemize and reflect upon well written changes
6566 gitk: Provide a 32x32 window icon based on the git logo
6568 Uwe Kleine-König (1):
6569 parseopt: fix documentation for --keep-dashdash
6572 Version v1.6.3-rc3; changes since v1.6.3-rc2:
6573 ---------------------------------------------
6575 Benjamin Kramer (1):
6576 connect: replace inet_ntop with getnameinfo
6579 t9001: use older Getopt::Long boolean prefix '--no' rather than '--no-'
6580 t7700-repack: repack -a now works properly, expect success from test
6582 Johannes Schindelin (1):
6583 Add an option not to use link(src, dest) && unlink(src) when that is unreliable
6589 progress bar: round to the nearest instead of truncating down
6591 Sitaram Chamarty (1):
6592 Remove obsolete bug warning in man git-update-server-info
6594 Wesley J. Landaker (2):
6595 Documentation: git-clean: fix minor grammatical errors
6596 Documentation: git-clean: make description more readable
6599 Version v1.6.3-rc2; changes since v1.6.3-rc1:
6600 ---------------------------------------------
6603 Wait for git diff to finish in git difftool
6604 Explain seemingly pointless use of system in difftool
6607 t4202-log: extend test coverage of graphing
6608 graph API: fix extra space during pre_commit_line state
6609 graph API: fix a bug in the rendering of octopus merges
6612 Work around ash "alternate value" expansion bug
6615 Add parsing of elm aliases to git-send-email
6618 Convert to use quiet option when available
6621 test-suite: adding a test for fast-export with tag variants
6622 builtin-fast-export.c: turn error into warning
6623 builtin-fast-export.c: fix crash on tagged trees
6624 builtin-fast-export.c: handle nested tags
6626 Frank Lichtenheld (1):
6627 gitcvs-migration: Link to git-cvsimport documentation
6630 gitweb: Fix snapshots requested via PATH_INFO
6633 add-interactive: refactor mode hunk handling
6634 t7800: respect NO_PERL
6637 Update docs on behaviour of 'core.sharedRepository' and 'git init --shared'
6639 Johannes Schindelin (1):
6640 Fix off-by-one in read_tree_recursive
6643 Windows: Work around intermittent failures in mingw_rename
6644 Windows: Skip fstat/lstat optimization in write_entry()
6645 builtin-help: silently tolerate unknown keys
6646 remote.c: do not trigger remote.<name>.<var> codepath for two-level names
6650 read-tree A B: do not corrupt cache-tree
6651 Move prime_cache_tree() to cache-tree.c
6652 read-tree -m A B: prime cache-tree from the switched-to tree
6653 checkout branch: prime cache-tree fully
6654 Revert "stat_tracking_info(): only count real commits"
6655 Makefile: ignore perl/ subdirectory under NO_PERL
6659 Speed up reflog pruning of unreachable commits
6662 Clean up reflog unreachability pruning decision
6664 Markus Heidelberg (1):
6665 grep: don't support "grep.color"-like config options
6668 git add -p: new "quit" command at the prompt.
6669 Update git-add.txt according to the new possibilities of 'git add -p'.
6670 clone: add test for push on an empty clone.
6672 Michael J Gruber (2):
6673 test-lib.sh: Help test_create_repo() find the templates dir
6674 Fix more typos/spelling in comments
6676 Michał Kiedrowicz (3):
6677 tests: test applying criss-cross rename patch
6678 builtin-apply: keep information about files to be deleted
6679 tests: make test-apply-criss-cross-rename more robust
6682 builtin-remote: fix typo in option description
6683 Documentation: fix typos / spelling mistakes
6684 Fix typos / spelling in comments
6686 Nguyễn Thái Ngọc Duy (1):
6687 Makefile: remove {fetch,send}-pack from PROGRAMS as they are builtins
6690 test-genrandom: Add newline to usage string
6691 config.txt: add missing format.{subjectprefix,cc,attach} variables
6692 Documentation: use lowercase for shallow and deep threading
6693 git-show-branch.txt: cleanup example description
6694 git-format-patch.txt: general rewordings and cleanups
6695 config.txt: add missing 'the's and make words plural
6696 config.txt: clarify sentences in the configuration and syntax sections
6697 config.txt: Make configuration paragraph more consistent
6699 Wesley J. Landaker (2):
6700 Documentation: git-svn: fix spurious bolding that mangles the output
6701 Documentation: git-svn: fix a grammatical error without awkwardness
6703 Wincent Colaiuta (1):
6704 git add -p: add missing "q" to patch prompt
6707 Version v1.6.3-rc1; changes since v1.6.3-rc0:
6708 ---------------------------------------------
6711 graph API: Added logic for colored edges
6714 shorten_unambiguous_ref(): add strict mode
6715 for-each-ref: utilize core.warnAmbiguousRefs for :short-format
6716 rev-parse: --abbrev-ref option to shorten ref name
6719 difftool: remove merge options for opendiff, tkdiff, kdiff3 and xxdiff
6720 difftool: remove the backup file feature
6721 difftool: use perl built-ins when testing for msys
6722 difftool: add a -y shortcut for --no-prompt
6723 difftool: move 'git-difftool' out of contrib
6724 difftool: add various git-difftool tests
6725 difftool: add support for a difftool.prompt config variable
6726 bash completion: add git-difftool
6727 mergetool: use $( ... ) instead of `backticks`
6728 difftool/mergetool: refactor commands to use git-mergetool--lib
6729 mergetool--lib: simplify API usage by removing more global variables
6732 git-shell: Add 'git-upload-archive' to allowed commands.
6735 Fix misspelled mergetool.keepBackup
6737 Frank Lichtenheld (1):
6738 init: Do not segfault on big GIT_TEMPLATE_DIR environment variable
6741 doc: clarify --no-track option
6742 doc: refer to tracking configuration as "upstream"
6743 doc/checkout: refer to git-branch(1) as appropriate
6744 doc/checkout: split checkout and branch creation in synopsis
6745 docs/checkout: clarify what "non-branch" means
6746 add-interactive: refactor mode hunk handling
6747 doc/gitattributes: clarify location of config text
6750 t1301-shared-repo: fix forced modes test
6753 gitignore git-bisect--helper
6754 unpack-trees: do not muck with attributes when we are not checking out
6755 Describe fixes since 1.6.2.3
6756 Update draft release notes to 1.6.3
6759 Allow users to un-configure rename detection
6760 process_{tree,blob}: show objects without buffering
6761 show_object(): push path_name() call further down
6763 Markus Heidelberg (5):
6764 doc/merge-config: list ecmerge as a built-in merge tool
6765 git-mergetool/difftool: make (g)vimdiff workable under Windows
6766 git-mergetool: add new merge tool TortoiseMerge
6767 doc/git-daemon: add missing arguments to options
6768 doc/git-daemon: add missing arguments to max-connections option
6771 git add -p: new "quit" command at the prompt.
6772 Update git-add.txt according to the new possibilities of 'git add -p'.
6774 Michael J Gruber (1):
6775 remote.c: use shorten_unambiguous_ref
6777 Michał Kiedrowicz (3):
6778 tests: test applying criss-cross rename patch
6779 builtin-apply: keep information about files to be deleted
6780 Documentation: boolean value may be given by on/off
6782 Nanako Shiraishi (1):
6783 git-am: teach git-am to apply a patch to an unborn branch
6785 Nguyễn Thái Ngọc Duy (3):
6786 get_local_heads(): do not return random pointer if there is no head
6787 attr: add GIT_ATTR_INDEX "direction"
6788 archive: do not read .gitattributes in working directory
6791 imap-send: use correct configuration variable in documentation
6793 Pierre Habouzit (1):
6794 hook/update: example of how to prevent branch creation
6797 archive tests: do not use .gitattributes in working directory
6798 archive test: attributes
6800 Sebastian Pipping (1):
6801 difftool/mergetool: add diffuse as merge and diff tool
6804 Fix buffer overflow in config parser
6807 git-apply: fix option description
6810 Version v1.6.3-rc0; changes since v1.6.2.5:
6811 -------------------------------------------
6814 disable post-checkout test on Cygwin
6815 Produce a nicer output in case of sha1_object_info failures in ls-tree -l
6816 Microoptimize strbuf_cmp
6817 Improve error message about fetch into current branch
6819 Ali Gholami Rudi (2):
6820 builtin-clone.c: make junk_pid static
6821 builtin-clone.c: no need to strdup for setenv
6824 Do not name "repo" struct "remote" in push_http.c
6825 http-push.c: use a faux remote to pass to http_init
6827 Arjen Laarhoven (2):
6828 Clean up use of ANSI color sequences
6829 builtin-branch.c: Rename branch category color names
6832 bash completion: add options for 'git fsck'
6835 git-svn: Add per-svn-remote ignore-paths config
6836 git-svn: Save init/clone --ignore-paths in config
6839 configure: ensure settings from user are also usable in the script
6840 configure: reorganize flow of argument checks
6841 configure: add macros to stash FLAG variables
6842 configure: wrap some library tests with GIT_STASH_FLAGS
6843 configure: asciidoc version test cleanup
6844 configure: make iconv tests aware of user arguments
6845 configure: rework pthread handling to allow for user defined flags
6846 documentation: Makefile accounts for SHELL_PATH setting
6848 Benjamin Kramer (4):
6849 Remove unused function scope local variables
6850 Move local variables to narrower scopes
6851 Remove unused assignments
6852 Fix various dead stores found by the clang static analyzer
6854 Björn Steinbrink (1):
6855 Mailmap: Allow empty email addresses to be mapped
6858 git-svn: speed up blame command
6861 builtin-send-pack.c: avoid empty structure initialization
6863 Brian Gernhardt (2):
6864 Create USE_ST_TIMESPEC and turn it on for Darwin
6865 Makefile: Set compiler switch for USE_NSEC
6867 Carlos Manuel Duclos Vergara (1):
6868 git-archive: add --output=<file> to send output to a file
6871 config: test for --replace-all with one argument and fix documentation.
6874 git-push.txt: describe how to default to pushing only current branch
6875 Documentation: remove extra quoting/emphasis around literal texts
6876 Documentation/Makefile: make most operations "quiet"
6877 Documentation/Makefile: break up texi pipeline
6878 Documentation: move callouts.xsl to manpage-{base,normal}.xsl
6879 Documentation: use parametrized manpage-base.xsl with manpage-{1.72,normal}.xsl
6880 Documentation: rename docbook-xsl-172 attribute to git-asciidoc-no-roff
6881 Documentation: move quieting params into manpage-base.xsl
6882 Documentation: move "spurious .sp" code into manpage-base.xsl
6883 Documentation: asciidoc.conf: always use <literallayout> for [blocktext]
6884 Documentation: asciidoc.conf: fix verse block with block titles
6885 Documentation: option to render literal text as bold for manpages
6886 Documentation: use "spurious .sp" XSLT if DOCBOOK_SUPPRESS_SP is set
6888 Christian Couder (24):
6889 rev-list: estimate number of bisection step left
6890 log-tree: fix patch filename computation in "git format-patch"
6891 quote: implement "sq_dequote_many" to unwrap many args in one string
6892 quote: add "sq_dequote_to_argv" to put unwrapped args in an argv array
6893 refs: add "for_each_ref_in" function to refactor "for_each_*_ref" functions
6894 rev-list: make "bisect_list" variable local to "cmd_rev_list"
6895 rev-list: move bisect related code into its own file
6896 rev-list: move code to show bisect vars into its own function
6897 rev-list: make "show_bisect_vars" non static
6898 rev-list: pass "revs" to "show_bisect_vars"
6899 sha1-lookup: add new "sha1_pos" function to efficiently lookup sha1
6900 patch-ids: use the new generic "sha1_pos" function to lookup sha1
6901 bisect: improve error message when branch checkout fails
6902 rev-list: call new "filter_skip" function
6903 bisect: use the new generic "sha1_pos" function to lookup sha1
6904 bisect--helper: implement "git bisect--helper"
6905 bisect: implement "read_bisect_paths" to read paths in "$GIT_DIR/BISECT_NAMES"
6906 bisect: use "bisect--helper" and remove "filter_skipped" function
6907 t6030: test bisecting with paths
6908 rev-list: pass "int flags" as last argument of "show_bisect_vars"
6909 bisect--helper: string output variables together with "&&"
6910 list-objects: add "void *data" parameter to show functions
6911 rev-list: remove last static vars used in "show_commit"
6912 rev-list: add "int bisect_show_flags" in "struct rev_list_info"
6915 Update delta compression message to be less misleading
6917 Daniel Barkalow (8):
6918 Make clone parse the default refspec with the normal code
6919 Use a single function to match names against patterns
6920 Use the matching function to generate the match results
6921 Keep '*' in pattern refspecs
6922 Support '*' in the middle of a refspec
6923 Use a common function to get the pretty name of refs
6924 Move push matching and reporting logic into transport.c
6925 Include log_config module in apache.conf
6928 contrib/difftool: use a separate config namespace for difftool commands
6931 add -i: revisit hunk on editor failure
6934 git-filter-branch: avoid collisions with variables in eval'ed commands
6935 Correct missing SP characters in grammar comment at top of fast-import.c
6936 fast-export: Avoid dropping files from commits
6939 config.txt: Describe special 'none' handling in core.gitProxy.
6942 git-svn: fix ls-tree usage with dash-prefixed paths
6945 connect.c: remove a few globals by using git_config callback data
6946 test-suite: adding a test for fast-export with tag variants
6947 builtin-fast-export.c: turn error into warning
6948 builtin-fast-export.c: fix crash on tagged trees
6949 builtin-fast-export.c: handle nested tags
6952 Make git blame's date output format configurable, like git log
6954 Felipe Contreras (14):
6955 config: Add new option to open an editor.
6956 git config: codestyle cleanups
6957 git_config(): not having a per-repo config file is not an error
6958 git config: trivial rename in preparation for parseopt
6959 git config: reorganize get_color*
6960 git config: reorganize to use parseopt
6961 git config: don't allow multiple config file locations
6962 git config: don't allow multiple variable types
6963 git config: don't allow extra arguments for -e or -l.
6964 git config: don't allow --get-color* and variable type
6965 Add tests for git log --pretty, --format and --oneline.
6966 user-manual: remove some git-foo usage
6967 docbook: change css style
6968 user-manual: the name of the hash function is SHA-1, not sha1
6970 Finn Arne Gangstad (7):
6971 New config push.default to decide default behavior for push
6972 Display warning for default git push with no push.default config
6973 builtin-remote.c: Split out prune_remote as a separate function.
6974 git remote update: New option --prune
6975 git remote update: Report error for non-existing groups
6976 remote: New function remote_is_configured()
6977 git remote update: Fallback to remote if group does not exist
6979 Giuseppe Bilotta (1):
6980 import-tars: separate author from committer
6983 Add warning about known issues to documentation of cvsimport
6984 Cleanup warning about known issues in cvsimport documentation
6985 Add configuration variable for sign-off to format-patch
6988 MinGW: implement mmap
6991 git-svn: add fetch --parent option
6994 builtin-branch: improve output when displaying remote branches
6995 move duplicated get_local_heads() to remote.c
6996 move duplicated ref_newer() to remote.c
6997 move locate_head() to remote.c
6998 remote: simplify guess_remote_head()
6999 remote: make copy_ref() perform a deep copy
7000 remote: let guess_remote_head() optionally return all matches
7001 remote: make match_refs() copy src ref before assigning to peer_ref
7002 remote: make match_refs() not short-circuit
7003 string-list: new for_each_string_list() function
7004 builtin-remote: refactor duplicated cleanup code
7005 builtin-remote: remove unused code in get_ref_states
7006 builtin-remote: rename variables and eliminate redundant function call
7007 builtin-remote: make get_remote_ref_states() always populate states.tracked
7008 builtin-remote: fix two inconsistencies in the output of "show <remote>"
7009 builtin-remote: teach show to display remote HEAD
7010 builtin-remote: add set-head subcommand
7011 builtin-remote: new show output style
7012 builtin-remote: new show output style for push refspecs
7013 send-email: add --confirm option and configuration setting
7014 bash completion: fix completion issues with fetch, pull, and push
7015 bash completion: refactor --strategy completion
7016 bash completion: teach fetch, pull, and push to complete their options
7017 send-email: refactor and ensure prompting doesn't loop forever
7018 send-email: add tests for refactored prompting
7019 send-email: don't attempt to prompt if tty is closed
7020 send-email: ask_default should apply to all emails, not just the first
7021 send-email: correct two tests which were going interactive
7022 send-email: ensure quoted addresses are rfc2047 encoded
7023 send-email: fix nasty bug in ask() function
7026 valgrind: ignore ldso and more libz errors
7027 branch: clean up repeated strlen
7028 add basic branch display tests
7029 test scripts: refactor start_httpd helper
7030 add basic http clone/fetch tests
7031 refactor find_ref_by_name() to accept const list
7032 remote: make guess_remote_head() use exact HEAD lookup if it is available
7033 clone: run post-checkout hook when checking out
7034 improve missing repository error message
7035 config: set help text for --bool-or-int
7036 t3000: use test_cmp instead of diff
7037 ls-files: fix broken --no-empty-directory
7038 ls-files: require worktree when --deleted is given
7039 make oneline reflog dates more consistent with multiline format
7040 remote: improve sorting of "configure for git push" list
7041 Makefile: turn on USE_ST_TIMESPEC for FreeBSD
7042 t0060: fix whitespace in "wc -c" invocation
7043 tests: remove exit after test_done call
7044 for-each-ref: refactor get_short_ref function
7045 for-each-ref: refactor refname handling
7046 for-each-ref: add "upstream" format field
7047 make get_short_ref a public function
7048 branch: show upstream branch when double verbose
7049 Makefile: allow building without perl
7050 tests: skip perl tests if NO_PERL is defined
7051 add tests for remote groups
7054 githooks documentation: post-checkout hook is also called after clone
7057 Enable setting attach as the default in .gitconfig for git-format-patch.
7058 imap.preformattedHTML to tell Thunderbird to send non-flowed text
7060 Johannes Schindelin (23):
7061 Add valgrind support in test scripts
7062 Valgrind support: check for more than just programming errors
7063 test-lib.sh: optionally output to test-results/$TEST.out, too
7064 t/Makefile: provide a 'valgrind' target
7065 Add a script to coalesce the valgrind outputs
7066 Tests: let --valgrind imply --verbose and --tee
7067 test-lib: avoid assuming that templates/ are in the GIT_EXEC_PATH
7068 valgrind: do not require valgrind 3.4.0 or newer
7069 Avoid segfault with 'git branch' when the HEAD is detached
7070 Turn the flags in struct dir_struct into a single variable
7071 git config: trivial cleanup for editor action
7072 rebase -i: avoid 'git reset' when possible
7073 MinGW: 64-bit file offsets
7074 Brown paper bag fix for MinGW 64-bit stat
7075 Add an (optional, since expensive) test for >2gb clones
7076 MinGW: fix diff --no-index /dev/null ...
7077 winansi: support ESC [ K (erase in line)
7078 test: do not LoadModule log_config_module unconditionally
7079 test-lib: write test results to test-results/<basename>-<pid>
7080 gc --aggressive: make it really aggressive
7081 t7300: fix clean up on Windows
7082 Guard a few Makefile variables against user environments
7083 git-svn: always initialize with core.autocrlf=false
7086 recv_sideband: Bands #2 and #3 always go to stderr
7087 test-suite: Make test script numbers unique
7088 t9400, t9401: Do not force hard-linked clone
7089 test suite: Use 'say' to say something instead of 'test_expect_success'
7090 Call 'say' outside test_expect_success
7091 test-lib: Replace uses of $(expr ...) by POSIX shell features.
7092 test-lib: Simplify test counting.
7093 test-lib: Introduce test_chmod and use it instead of update-index --chmod
7094 t2200, t7004: Avoid glob pattern that also matches files
7095 t5300, t5302, t5303: Do not use /dev/zero
7096 t5602: Work around path mangling on MSYS
7097 test-lib: Work around incompatible sort and find on Windows
7098 test-lib: Work around missing sum on Windows
7099 Tests on Windows: $(pwd) must return Windows-style paths
7100 t0050: Check whether git init detected symbolic link support correctly
7101 test-lib: Infrastructure to test and check for prerequisites
7102 t3600: Use test prerequisite tags
7103 Skip tests that fail if the executable bit is not handled by the filesystem
7104 t5302: Use prerequisite tags to skip 64-bit offset tests
7105 t9100, t9129: Use prerequisite tags for UTF-8 tests
7106 Use prerequisite tags to skip tests that depend on symbolic links
7107 t0060: Fix tests on Windows
7108 Skip tests that require a filesystem that obeys POSIX permissions
7109 t3700: Skip a test with backslashes in pathspec
7110 Use prerequisites to skip tests that need unzip
7111 t7004: Use prerequisite tags to skip tests that need gpg
7112 t5503: GIT_DEBUG_SEND_PACK is not supported on MinGW
7113 MinGW: Quote arguments for subprocesses that contain a single-quote
7114 t7005-editor: Use $SHELL_PATH in the editor scripts
7115 t7502-commit: Skip SIGTERM test on Windows
7118 Modify description file to say what this file is
7119 Google has renamed the imap folder
7120 Improve error message for git-filter-branch
7121 Documentation - More examples for git bisect
7123 Junio C Hamano (28):
7124 git-blame: refactor code to emit "porcelain format" output
7125 blame: show "previous" information in --porcelain/--incremental format
7126 Make git-clone respect branch.autosetuprebase
7127 Draft release notes: Carry forward the warning for behaviour changes
7128 Update draft release notes to 1.6.3
7129 builtin-remote.c: no "commented out" code, please
7130 Not all systems use st_[cm]tim field for ns resolution file timestamp
7131 grep: cast printf %.*s "precision" argument explicitly to int
7132 http.c: style cleanups
7133 Improve "git branch --tracking" output
7134 http_init(): Fix config file parsing
7135 http authentication via prompts
7136 Update release notes to 1.6.3
7137 http.c: CURLOPT_NETRC_OPTIONAL is not available in ancient versions of cURL
7138 Read attributes from the index that is being checked out
7139 Update draft release notes to 1.6.3
7140 http tests: Darwin is not that special
7141 Rename interpret/substitute nth_last_branch functions
7142 strbuf_branchname(): a wrapper for branch name shorthands
7143 check-ref-format --branch: give Porcelain a way to grok branch shorthand
7144 Fix branch -m @{-1} newname
7145 strbuf_check_branch_ref(): a helper to check a refname for a branch
7146 check_ref_format(): tighten refname rules
7147 Update draft release notes to 1.6.3
7148 Update draft release notes to 1.6.3
7149 sha1-lookup: fix up the assertion message
7150 Update draft release notes to 1.6.3
7154 Speed up reflog pruning of unreachable commits
7157 Use DIFF_XDL_SET/DIFF_OPT_SET instead of raw bit-masking
7158 Fix neglect of diff_setup()/diff_setup_done() symmetry.
7161 builtin-push.c: Fix typo: "anythig" -> "anything"
7163 Kevin McConnell (1):
7164 Add --staged to bash completion for git diff
7167 lstat_cache(): small cleanup and optimisation
7168 lstat_cache(): generalise longest_match_lstat_cache()
7169 lstat_cache(): swap func(length, string) into func(string, length)
7170 unlink_entry(): introduce schedule_dir_for_removal()
7171 create_directories(): remove some memcpy() and strchr() calls
7172 write_entry(): cleanup of some duplicated code
7173 write_entry(): use fstat() instead of lstat() when file is open
7174 show_patch_diff(): remove a call to fstat()
7175 lstat_cache(): print a warning if doing ping-pong between cache types
7176 check_updates(): effective removal of cache entries marked CE_REMOVE
7177 fix compile error when USE_NSEC is defined
7178 make USE_NSEC work as expected
7179 verify_uptodate(): add ce_uptodate(ce) test
7180 write_index(): update index_state->timestamp after flushing to disk
7181 stat_tracking_info(): only count real commits
7182 Record ns-timestamps if possible, but do not use it without USE_NSEC
7183 checkout bugfix: use stat.mtime instead of stat.ctime in two places
7184 Revert "lstat_cache(): print a warning if doing ping-pong between cache types"
7187 Add a test for checking whether gitattributes is honored by checkout.
7190 Clean up reflog unreachability pruning decision
7191 Allow users to un-configure rename detection
7193 Marius Storm-Olsen (2):
7194 Add bare repository indicator for __git_ps1
7195 Fixup: Add bare repository indicator for __git_ps1
7197 Markus Heidelberg (1):
7198 add --html-path to get the location of installed HTML docs
7201 Allow curl to rewind the read buffers
7204 git-send-email.txt: clarify which options take an argument.
7205 git-rev-list.txt: make ascii markup uniform with other pages.
7207 Michael Hendricks (1):
7208 format-patch: add arbitrary email headers
7210 Michael J Gruber (6):
7211 Typo and language fixes for git-checkout.txt
7212 test-lib.sh: Test for presence of git-init in the right path.
7213 test-lib.sh: Allow running the test suite against installed git
7214 git-branch.txt: document -f correctly
7215 Test for local branches being followed with --track
7216 Make local branches behave like remote branches when --tracked
7219 git-svn: support intermediate paths when matching tags/branches
7221 Michele Ballabio (6):
7222 apply: consistent spelling of "don't"
7223 apply: hide unused options from short help
7224 git log: avoid segfault with --all-match
7225 document --force-rebase
7226 rebase: add options passed to git-am
7227 rebase: fix typo (force_rebas -> force-rebas)
7230 Replace ",<,>,& with their respective XML entities in DAV requests
7233 parse-opt: migrate builtin-ls-files.
7234 Tests: use test_cmp instead of diff where possible
7235 http-push: using error() and warning() as appropriate
7236 builtin-apply: use warning() instead of fprintf(stderr, "warning: ")
7237 builtin-checkout: use warning() instead of fprintf(stderr, "warning: ")
7238 builtin-fetch-pack: use warning() instead of fprintf(stderr, "warning: ")
7239 builtin-init-db: use warning() instead of fprintf(stderr, "warning: ")
7240 builtin-rm: use warning() instead of fprintf(stderr, "warning: ")
7241 builtin-show-branch: use warning() instead of fprintf(stderr, "warning: ")
7242 builtin-show-ref: use warning() instead of fprintf(stderr, "warning: ")
7243 refs: use warning() instead of fprintf(stderr, "warning: ")
7245 Nanako Shiraishi (4):
7246 Add --format that is a synonym to --pretty
7247 Give short-hands to --pretty=tformat:%formatstring
7248 Add --oneline that is a synonym to "--pretty=oneline --abbrev-commit"
7249 Documentation/git.txt: GIT 1.6.2.2 has been out for a while
7252 format-patch: Respect --quiet option
7254 Nguyễn Thái Ngọc Duy (1):
7255 grep: prefer builtin over external one when coloring results
7258 git-p4: remove tabs from usermap file
7261 MinGW: a helper function that translates Win32 API error codes
7262 MinGW: a hardlink implementation
7264 Ramsay Allan Jones (1):
7265 git-instaweb: fix lighttpd configuration on cygwin
7268 grep: micro-optimize hit collection for AND nodes
7269 grep: remove grep_opt argument from match_expr_eval()
7270 grep: add pmatch and eflags arguments to match_one_pattern()
7271 grep: color patterns in output
7272 grep: add support for coloring with external greps
7273 parseopt: add PARSE_OPT_KEEP_UNKNOWN
7274 parseopt: add PARSE_OPT_NO_INTERNAL_HELP
7275 parseopt: make usage optional
7276 archive: use parseopt for local-only options
7277 parseopt: document KEEP_ARGV0, KEEP_UNKNOWN, NO_INTERNAL_HELP
7278 parseopt: prevent KEEP_UNKNOWN and STOP_AT_NON_OPTION from being used together
7279 pickaxe: count regex matches only once
7282 rerere: remove duplicated functions
7285 Documentation: enhance branch.<name>.{remote,merge}
7286 Documentation: push.default applies to all remotes
7287 Documentation: branch.*.merge can also affect 'git-push'
7288 Documentation: Introduce "upstream branch"
7290 Shawn O. Pearce (1):
7291 Don't permit ref/branch names to end with ".lock"
7294 git-svn: don't output git commits in quiet mode
7295 git-svn: add a double quiet option to hide git commits
7298 git-send-email.txt: describe --compose better
7299 pretty.c: add %f format specifier to format_commit_message()
7300 format-patch: construct patch filename in one function
7301 format-patch: pass a commit to reopen_stdout()
7302 format-patch: move get_patch_filename() into log-tree
7303 format-patch: --attach/inline uses filename instead of SHA1
7304 format-patch: --numbered-files and --stdout aren't mutually exclusive
7305 completion: add --annotate option to send-email
7306 completion: add --cc and --no-attachment option to format-patch
7307 completion: add --thread=deep/shallow to format-patch
7308 format_sanitized_subject: Don't trim past initial length of strbuf
7310 Sverre Rabbelier (1):
7311 Teach rebase to rebase even if upstream is up to date
7314 http.c: use strbuf API in quote_ref_url
7317 completion: For consistency, change "git rev-parse" to __gitdir calls
7318 completion: Use consistent if [...] convention, not "test"
7319 completion: Better __git_ps1 support when not in working directory
7320 completion: More fixes to prevent unbound variable errors
7323 bash completion: add --format= and --oneline options for "git log"
7326 format-patch: threading test reactivation
7327 Support coverage testing with GCC/gcov
7328 Test that diff can read from stdin
7329 Test diff --dirstat functionality
7331 Test fsck a bit harder
7333 Test rev-list --parents/--children
7335 format-patch: track several references
7336 format-patch: thread as reply to cover letter even with in-reply-to
7337 format-patch: support deep threading
7338 Documentation: filter-branch: show --ignore-unmatch in main index-filter example
7341 bash completion: Update 'git am' options
7343 Tor Arne Vestbø (2):
7344 git-rebase: Add --stat and --no-stat for producing diffstat on rebase
7345 git-pull: Allow --stat and --no-stat to be used with --rebase
7347 Wesley J. Landaker (1):
7348 Documentation: git-svn: fix trunk/fetch svn-remote key typo
7350 Wincent Colaiuta (2):
7351 Grammar fixes to "merge" and "patch-id" docs
7352 Grammar fix for "git merge" man page
7355 Version v1.6.2.5; changes since v1.6.2.4:
7356 -----------------------------------------
7359 builtin-merge: fix a typo in an error message
7360 Documentation: fix a grammatical error in api-builtin.txt
7362 Frank Lichtenheld (1):
7363 gitcvs-migration: Link to git-cvsimport documentation
7365 Johannes Schindelin (1):
7366 Fix off-by-one in read_tree_recursive
7369 read-tree A B: do not corrupt cache-tree
7370 Move prime_cache_tree() to cache-tree.c
7371 read-tree -m A B: prime cache-tree from the switched-to tree
7372 checkout branch: prime cache-tree fully
7373 diff -c -p: do not die on submodules
7378 process_{tree,blob}: show objects without buffering
7379 show_object(): push path_name() call further down
7380 grep: fix segfault when "git grep '('" is given
7382 Michał Kiedrowicz (3):
7383 tests: test applying criss-cross rename patch
7384 builtin-apply: keep information about files to be deleted
7385 tests: make test-apply-criss-cross-rename more robust
7388 honor repack.usedeltabaseoffset when fetching packs
7391 test-genrandom: Add newline to usage string
7393 Wincent Colaiuta (1):
7394 git add -p: add missing "q" to patch prompt
7397 Version v1.6.2.4; changes since v1.6.2.3:
7398 -----------------------------------------
7400 Björn Steinbrink (1):
7401 tree_entry_interesting: a pathspec only matches at directory boundary
7403 Clemens Buchacher (3):
7404 add tests for merging with submodules
7405 update cache for conflicting submodule entries
7406 simplify output of conflicting merge
7409 test-suite: adding a test for fast-export with tag variants
7410 builtin-fast-export.c: turn error into warning
7411 builtin-fast-export.c: fix crash on tagged trees
7412 builtin-fast-export.c: handle nested tags
7414 Frank Lichtenheld (1):
7415 init: Do not segfault on big GIT_TEMPLATE_DIR environment variable
7418 doc/gitattributes: clarify location of config text
7419 add-interactive: refactor mode hunk handling
7422 Update docs on behaviour of 'core.sharedRepository' and 'git init --shared'
7424 Johannes Schindelin (1):
7425 Fix 'git checkout <submodule>' to update the index
7428 t1301-shared-repo: fix forced modes test
7431 match_tree_entry(): a pathspec only matches at directory boundaries
7432 Describe fixes since 1.6.2.3
7436 Speed up reflog pruning of unreachable commits
7439 Clean up reflog unreachability pruning decision
7441 Markus Heidelberg (2):
7442 doc/git-daemon: add missing arguments to options
7443 doc/git-daemon: add missing arguments to max-connections option
7446 git add -p: new "quit" command at the prompt.
7447 Update git-add.txt according to the new possibilities of 'git add -p'.
7449 Nguyễn Thái Ngọc Duy (1):
7450 Makefile: remove {fetch,send}-pack from PROGRAMS as they are builtins
7453 imap-send: use correct configuration variable in documentation
7456 Fix buffer overflow in config parser
7459 git-apply: fix option description
7462 Version v1.6.2.3; changes since v1.6.2.2:
7463 -----------------------------------------
7465 Björn Steinbrink (1):
7466 process_{tree,blob}: Remove useless xstrdup calls
7469 t7700-repack: add two new tests demonstrating repacking flaws
7470 git-repack.sh: don't use --kept-pack-only option to pack-objects
7471 pack-objects: only repack or loosen objects residing in "local" packs
7472 Remove --kept-pack-only option and associated infrastructure
7473 t7700: demonstrate repack flaw which may loosen objects unnecessarily
7474 pack-objects: don't loosen objects available in alternate or kept packs
7477 git-repack: use non-dashed update-server-info
7479 Daniel Cheng (aka SDiZ) (1):
7480 State the effect of filter-branch on graft explicitly
7483 Change double quotes to single quotes in message
7486 Documentation: clarify .gitattributes search
7489 t1301: loosen test for forced modes
7490 commit: abort commit if interactive add failed
7493 Move chmod(foo, 0444) into move_temp_to_file()
7496 git submodule: fix usage line
7498 Junio C Hamano (12):
7499 git-repack: resist stray environment variable
7500 has_sha1_pack(): refactor "pretend these packs do not exist" interface
7501 has_sha1_kept_pack(): take "struct rev_info"
7502 Consolidate ignore_packed logic more
7503 Simplify is_kept_pack()
7504 is_kept_pack(): final clean-up
7505 diff --cached: do not borrow from a work tree when a path is marked as assume-unchanged
7506 "core.sharedrepository = 0mode" should set, not loosen
7507 move_temp_to_file(): do not forget to chmod() in "Coda hack" codepath
7508 set_shared_perm(): sometimes we know what the final mode bits should look like
7509 Start 1.6.2.3 preparation
7513 process_{tree,blob}: Remove useless xstrdup calls
7515 Markus Heidelberg (1):
7516 doc/git-pack-refs: fix two grammar issues
7519 git-checkout.txt: fix incorrect statement about HEAD and index
7520 git-checkout.txt: clarify that <branch> applies when no path is given.
7521 git-pull.sh: better warning message for "git pull" on detached head.
7524 Version v1.6.2.2; changes since v1.6.2.1:
7525 -----------------------------------------
7528 Documentation: update graph api example.
7531 git-branch: display "was sha1" on branch deletion rather than just "sha1"
7533 Carlo Marcelo Arenas Belon (1):
7534 documentation: update cvsimport description of "-r" for recent clone
7536 Daniel Barkalow (1):
7537 Give error when no remote is configured
7539 Daniel Cheng (aka SDiZ) (1):
7540 Fix bash completion in path with spaces
7543 everyday: use the dashless form of git-init
7545 David J. Mellor (12):
7546 Documentation: minor grammatical fixes in git-archive.txt.
7547 Documentation: reword the "Description" section of git-bisect.txt.
7548 Documentation: minor grammatical fixes in git-blame.txt.
7549 Documentation: minor grammatical fixes in git-branch.txt.
7550 Documentation: reworded the "Description" section of git-bisect.txt.
7551 Documentation: reword example text in git-bisect.txt.
7552 Documentation: remove some uses of the passive voice in git-bisect.txt
7553 Documentation: minor grammatical fixes and rewording in git-bundle.txt
7554 Documentation: minor grammatical fixes in git-cat-file.txt
7555 Documentation: minor grammatical fixes in git-check-attr.txt
7556 Documentation: minor grammatical fix in git-check-ref-format.txt
7557 Documentation: Remove spurious uses of "you" in git-bisect.txt.
7560 test-lib: Clean up comments and Makefile.
7563 git-svn: fix ls-tree usage with dash-prefixed paths
7566 Documentation: Remove an odd "instead"
7569 doc: clarify how -S works
7570 ls-files: require worktree when --deleted is given
7571 fix portability problem with IS_RUN_COMMAND_ERR
7573 Johannes Schindelin (4):
7574 rsync transport: allow local paths, and fix tests
7575 Smudge the files fed to external diff and textconv
7576 import-zips: fix thinko
7577 mailmap: resurrect lower-casing of email addresses
7580 Propagate --exec-path setting to external commands via GIT_EXEC_PATH
7581 diff --no-index: Do not generate patch output if other output is requested
7584 read-tree A B C: do not create a bogus index and do not segfault
7585 Remove total confusion from git-fetch and git-push
7586 blame: read custom grafts given by -S before calling setup_revisions()
7587 Update draft release notes to 1.6.2.2
7588 Update draft release notes to 1.6.2.2
7592 close_sha1_file(): make it easier to diagnose errors
7594 Michael J Gruber (2):
7595 git submodule: Add test cases for git submodule add
7596 git submodule: Fix adding of submodules at paths with ./, .. and //
7598 Nico -telmich- Schottelius (1):
7599 git-tag(1): add hint about commit messages
7602 avoid possible overflow in delta size filtering computation
7605 diffcore-pickaxe: use memmem()
7606 optimize compat/ memmem()
7607 pickaxe: count regex matches only once
7609 Shawn O. Pearce (1):
7610 Increase the size of the die/warning buffer to avoid truncation
7613 format-patch: --numbered-files and --stdout aren't mutually exclusive
7616 send-email: respect in-reply-to regardless of threading
7617 send-email: test --no-thread --in-reply-to combination
7618 Documentation: format-patch --root clarifications
7619 bash completion: only show 'log --merge' if merging
7622 Version v1.6.2.1; changes since v1.6.2:
7623 ---------------------------------------
7626 builtin-revert.c: release index lock when cherry-picking an empty commit
7628 Christian Couder (1):
7629 Documentation: fix badly indented paragraphs in "--bisect-all" description
7632 Ensure proper setup of git_dir for git-hash-object
7634 Finn Arne Gangstad (1):
7635 Support "\" in non-wildcard exclusion entries
7638 send-email: allow send-email to run outside a repo
7639 send-email: handle multiple Cc addresses when reading mbox message
7640 send-email: --suppress-cc improvements
7641 send-email: don't create temporary compose file until it is needed
7644 never fallback relative times to absolute
7645 t1300: use test_must_fail as appropriate
7646 document config --bool-or-int
7649 Make the 'lock file' exists error more informative
7652 git-add -i/-p: learn to unwrap C-quoted paths
7653 Beginning of 1.6.2 maintenance track
7654 Update draft release notes for 1.6.2.1
7658 cleanup: add isascii()
7661 Version v1.6.2; changes since v1.6.2-rc2:
7662 -----------------------------------------
7665 git-svn - return original format_svn_date semantics
7667 Christian Couder (2):
7668 bisect: fix quoting TRIED revs when "bad" commit is also "skip"ped
7669 bisect: fix another instance of eval'ed string
7672 added missing backtick in git-apply.txt
7674 David J. Mellor (4):
7675 Documentation: minor grammatical fixes.
7676 Documentation: minor grammatical fixes.
7677 Documentation: minor grammatical fixes.
7678 Documentation: minor grammatical fixes.
7681 git-svn: disable broken symlink workaround by default
7684 t5540-http-push.sh: avoid non-portable grep -P
7687 t3400-rebase: Move detached HEAD check earlier
7690 git-am: make --abort less dangerous
7693 Michael J Gruber (1):
7694 git-am: Keep index in case of abort with dirty index
7697 Fix odb_mkstemp() on AIX
7698 Documentation: Typos / spelling fixes in RelNotes
7699 Documentation: Expand a couple of abbreviations
7700 Documentation: Typo / spelling / formatting fixes
7703 gitk: Fix possible infinite loop and display corruption
7706 Documentation/git-archive.txt: Note attributes
7709 git-rebase: Update --whitespace documentation
7712 Version v1.6.2-rc2; changes since v1.6.2-rc1:
7713 ---------------------------------------------
7715 Abhijit Menon-Sen (1):
7716 Convert git-* invocations to "git *" in the svnimport example.
7718 Alexandre Julliard (3):
7719 git.el: Make sure that file lists are sorted as they are created.
7720 git.el: Improve the confirmation message on remove and revert.
7721 Add a README in the contrib/emacs directory.
7724 trace: Fixed a minor typo in an error message.
7727 git-svn fix to avoid using strftime %z
7729 Brian Gernhardt (1):
7730 git-svn: Create leading directories in create-ignore
7732 Christian Couder (1):
7733 README: fix path to "gitcvs-migration.txt" and be more consistent
7736 git-svn: fix delete+add branch tracking with empty files
7738 Felipe Contreras (2):
7739 git add: trivial codestyle cleanup
7740 sha1_file.c: fix typo
7743 Documentation/git-push: --all, --mirror, --tags can not be combined
7744 Install builtins with the user and group of the installing personality
7745 git-quiltimport: preserve standard input to be able to read user input
7747 Giuseppe Bilotta (1):
7748 gitweb: fix wrong base URL when non-root DirectoryIndex
7751 disallow providing multiple upstream branches to rebase, pull --rebase
7752 Allow HTTP tests to run on Darwin
7754 Johannes Schindelin (2):
7755 Introduce the function strip_path_suffix()
7756 system_path(): simplify using strip_path_suffix(), and add suffix "git"
7759 gitattributes.txt: Path matching rules are explained in gitignore.txt
7762 git-svn: fix parsing of timestamp obtained from svn
7763 tests: fix "export var=val"
7764 Make sure objects/pack exists before creating a new pack
7767 Lars Noschinski (1):
7768 filter-branch -d: Export GIT_DIR earlier
7771 Support 'raw' date format
7774 Docs: Expand explanation of the use of + in git push refspecs.
7777 gitweb: Fix warnings with override permitted but no repo override
7778 gitweb: Hyperlink multiple git hashes on the same commit message line
7781 Document git blame --reverse.
7782 More friendly message when locking the index fails.
7784 Michael J Gruber (1):
7785 Fix typo in contrib/examples/git-svnimport.txt
7788 Skip timestamp differences for diff --no-index
7791 git-p4: avoid syncing duplicate changes
7793 Peter Oberndorfer (1):
7794 git-svn: read the dcommit url from the config file on a per remote basis
7797 bash: add missing 'git merge' options
7798 bash: update 'git svn' options
7801 bash completion: refactor common log, shortlog and gitk options
7802 bash completion: only show 'log --merge' if merging
7805 Documentation: Note file formats send-email accepts
7808 Version v1.6.2-rc1; changes since v1.6.2-rc0:
7809 ---------------------------------------------
7811 Alexandre Julliard (1):
7812 Describe notable git.el changes in the release notes
7814 Anton Gyllenberg (1):
7815 test case for regression caused by git-svn empty symlink fix
7817 Christian Couder (1):
7818 rev-list: fix showing distance when using --bisect-all
7821 git-svn: Print revision while searching for earliest use of path
7824 git-svn: Fix for rewriteRoot URL containing username.
7827 fast-export: ensure we traverse commits in topological order
7830 filter-branch: Add more error-handling
7833 git-svn: allow disabling expensive broken symlink checks
7834 git-svn: fix broken symlink workaround when switching branches
7837 submodule: add --no-fetch parameter to update command
7840 Add 'rm -f' equivalent to 'git rm' example of filter-branch --index-filter
7843 gitweb: Better regexp for SHA-1 committag match
7846 symbolic-ref: allow refs/<whatever> in HEAD
7849 Update documentation to add further information about using Thunderbird with git-imap-send.
7851 Johannes Schindelin (4):
7852 Let ls-files strip trailing slashes in submodules' paths
7853 submodule: warn about non-submodules
7854 Add two extra tests for git rebase
7855 gc: make --prune useful again by accepting an optional parameter
7858 Make test-path-utils more robust against incorrect use
7859 Move sanitary_path_copy() to path.c and rename it to normalize_path_copy()
7860 Test and fix normalize_path_copy()
7861 Remove unused normalize_absolute_path()
7863 Junio C Hamano (16):
7864 Revert "Merge branch 'js/notes'"
7865 Modernize t5400 test script
7866 remote prune: warn dangling symrefs
7867 Warn use of "origin" when remotes/origin/HEAD is dangling
7868 Drop double-semicolon in C
7869 receive-pack: receive.denyDeleteCurrent
7870 builtin-receive-pack.c: do not initialize statics to 0
7871 revision traversal and pack: notice and die on missing commit
7872 Squelch overzealous "ignoring dangling symref" in an empty repository
7873 Make repack less likely to corrupt repository
7874 Prepare for 1.6.1.4.
7875 Revert "validate_headref: tighten ref-matching to just branches"
7876 Install the default "master" branch configuration after cloning a void
7877 Teach the "@{-1} syntax to "git branch"
7878 Teach @{-1} to git merge
7882 Remove redundant bit clears from diff_setup()
7885 tree.c: allow read_tree_recursive() to traverse gitlink entries
7888 git-sh-setup: Use "cd" option, not /bin/pwd, for symlinked work tree
7890 Marius Storm-Olsen (5):
7891 Add mailmap.file as configurational option for mailmap location
7892 Add find_insert_index, insert_at_index and clear_func functions to string_list
7893 Add map_user() and clear_mailmap() to mailmap
7894 Change current mailmap usage to do matching on both name and email of author/committer.
7895 Move mailmap documentation into separate file
7898 git-rebase.txt: --interactive does not work with --whitespace
7901 bash-completion: Complete the values of color.interactive, color.ui, color.pager
7904 gitweb: add $prevent_xss option to prevent XSS by repository content
7906 Michael J Gruber (1):
7907 Fix the installation path for html documentation
7910 Bugfix: GIT_EXTERNAL_DIFF with more than one changed files
7913 Fix contrib/hooks/post-receive-email for new duplicate branch
7916 Fix GIT_CEILING_DIRECTORIES on Windows
7917 builtin-receive-pack.c: fix compiler warnings about format string
7920 Move 'rev-parse --git-dir' test to t1500
7921 t1500: more 'git rev-parse --git-dir' tests
7922 bash: fix misspelled 'git svn' option
7925 git-svn: abstract out a block into new method other_gs()
7928 doc/bundle: Use the more conventional suffix '.bundle'
7930 Shawn O. Pearce (2):
7931 Clear the delta base cache during fast-import checkpoint
7932 Clear the delta base cache if a pack is rebuilt
7934 Sitaram Chamarty (1):
7935 Documentation: clarify commits affected by gitk --merge
7938 add -p: get rid of Git.pm warnings about unitialized values
7939 Makefile: resort filenames alphabetically
7940 Generalize and libify index_is_dirty() to index_differs_from(...)
7943 use a hash of the lock token as the suffix for PUT/MOVE
7946 completion: Fix GIT_PS1_SHOWDIRTYSTATE to prevent unbound variable errors.
7947 completion: Get rid of tabbed indentation in comments. Replace with spaces.
7950 log: do not print ellipses with --abbrev-commit
7951 Documentation: pruning recipe for destructive filter-branch
7954 git-web--browse: Fix check for /bin/start
7957 Version v1.6.2-rc0; changes since v1.6.1.3:
7958 -------------------------------------------
7961 builtin-shortlog.c: use string_list_append(), and don't strdup unnecessarily
7962 git.c: make autocorrected aliases work
7963 t7501-commit.sh: explicitly check that -F prevents invoking the editor
7965 Alexander Potashev (4):
7966 remove trailing LF in die() messages
7967 add is_dot_or_dotdot inline function
7968 Allow cloning to an existing empty directory
7969 Replace deprecated dashed git commands in usage
7971 Alexandre Julliard (8):
7972 git.el: Add a checkout command.
7973 git.el: Add a command to create a new branch.
7974 git.el: Add commands for cherry-pick and revert.
7975 git.el: Make git-run-command-region display the error if any.
7976 git.el: Set a regexp for paragraph-separate in log-edit mode.
7977 git.el: Use integer instead of character constants in case statement.
7978 git.el: Add some notes about Emacs versions compatibility.
7979 emacs: Remove the no longer maintained vc-git package.
7981 Arjen Laarhoven (1):
7982 t/t4202-log.sh: Add testcases
7984 Benjamin Kramer (1):
7987 Boyd Stephen Smith Jr (2):
7988 color-words: Support diff.wordregex config option
7989 Change the spelling of "wordregex".
7992 t7700: demonstrate misbehavior of 'repack -a' when local packs exist
7993 Makefile: use shell for-loop rather than Make's foreach loop during install
7996 Fix some tab/space inconsistencies in git-mergetool.sh
7997 Add -y/--no-prompt option to mergetool
7998 mergetool: Add prompt to continue after failing to merge a file
7999 mergetool: Don't keep temporary merge files unless told to
8000 mergetool: respect autocrlf by using checkout-index
8001 mergetool: Add a test for running mergetool in a sub-directory
8002 mergetool: fix running mergetool in sub-directories
8004 Christian Couder (1):
8005 sha1_file: make "read_object" static
8007 Clemens Buchacher (2):
8008 clean up pathspec matching
8009 remove pathspec_match, use match_pathspec instead
8012 contrib: add 'git difftool' for launching common merge tools
8013 difftool: fix documentation problems
8014 difftool: put the cursor on the editable file for Vim
8015 contrib/difftool: Don't repeat merge tool candidates
8017 David M. Syzdek (1):
8018 autoconf: Enable threaded delta search when pthreads are supported
8021 filter-branch: Fix fatal error on bare repositories
8024 git-svn: add --authors-file test
8025 git-svn: handle empty files marked as symlinks in SVN
8026 git-svn: better attempt to handle broken symlink updates
8027 git-svn: fix SVN 1.1.x compatibility
8028 git-svn: avoid importing nested git repos
8029 git-svn: fix memory leak when checking for empty symlinks
8032 cvsserver: add option to configure commit message
8033 cvsserver: change generation of CVS author names
8035 Geoffrey Thomas (2):
8036 utf8: add utf8_strwidth()
8037 builtin-blame.c: Use utf8_strwidth for author's names
8039 Giuseppe Bilotta (16):
8040 gitweb: add patch view
8041 gitweb: change call pattern for git_commitdiff
8042 gitweb: add patches view
8043 gitweb: link to patch(es) view in commit(diff) and (short)log view
8044 gitweb: use href() when generating URLs in OPML
8045 gitweb: don't use pathinfo for global actions
8046 gitweb: suggest name for OPML view
8047 gitweb: channel image in rss feed
8048 gitweb: feed generator metadata
8049 gitweb: rss feed managingEditor
8050 gitweb: rss channel date
8051 gitweb: last-modified time should be commiter, not author
8052 gitweb: check if-modified-since for feeds
8053 gitweb: make static files accessible with PATH_INFO
8054 gitweb: webserver config for PATH_INFO
8055 gitweb: align comments to code
8058 Make opt_parse_with_commit() non-static
8059 Make has_commit() non-static
8060 git-tag: Add --contains option
8063 gitweb: Move 'lineno' id from link to row element in git_blame
8064 gitweb: A bit of code cleanup in git_blame()
8065 gitweb: cache $parent_commit info in git_blame()
8066 gitweb: Update README that gitweb works better with PATH_INFO
8069 git-am: minor cleanups
8070 builtin-remote: make rm() use properly named variable to hold return value
8071 builtin-remote: make rm operation safer in mirrored repository
8072 Makefile: minor improvements for Mac OS X (Darwin)
8075 Makefile: clean up TEST_PROGRAMS definition
8076 color: make it easier for non-config to parse color specs
8077 expand --pretty=format color options
8078 diff: refactor tempfile cleanup handling
8079 chain kill signals for cleanup functions
8080 refactor signal handling for cleanup functions
8081 pager: do wait_for_pager on signal death
8082 git: s/run_command/run_builtin/
8083 run_command(): handle missing command errors more gracefully
8084 run_command(): help callers distinguish errors
8085 git: use run_command() to execute dashed externals
8086 validate_headref: tighten ref-matching to just branches
8087 symbolic ref: refuse non-ref targets in HEAD
8088 t0005: use SIGTERM for sigchain test
8090 Johannes Gilger (1):
8091 mergetool: Don't repeat merge tool candidates
8093 Johannes Schindelin (26):
8094 Force t5302 to use a single thread
8095 Introduce commit notes
8096 Add a script to edit/inspect notes
8097 git wrapper: Make while loop more reader-friendly
8098 bundle: allow rev-list options to exclude annotated tags
8099 show <tag>: reuse pp_user_info() instead of duplicating code
8100 Implement the patience diff algorithm
8101 Introduce the diff option '--patience'
8102 bash completions: Add the --patience option
8103 Speed up git notes lookup
8104 Add an expensive test for git-notes
8105 Add color_fwrite_lines(), a function coloring each line individually
8106 color-words: refactor word splitting and use ALLOC_GROW()
8107 color-words: change algorithm to allow for 0-character word boundaries
8108 color-words: take an optional regular expression describing words
8109 Fix parsing of @{-1}@{1}
8110 rebase -i --root: fix check for number of arguments
8111 Fix submodule squashing into unrelated commit
8112 t3404 & t3411: undo copy&paste
8113 lib-rebase.sh: Document what set_fake_editor() does
8114 test-lib.sh: introduce test_commit() and test_merge() helpers
8118 Fix 'git diff --no-index' with a non-existing symlink target
8119 filter-branch: do not consider diverging submodules a 'dirty worktree'
8122 Windows: Fix signal numbers
8123 Windows: Fix intermittent failures of t7701
8126 Fix Documentation typos surrounding the word 'handful'.
8129 git-am: Make it easier to see which patch failed
8131 Junio C Hamano (29):
8132 Document "git-reset --merge"
8134 Resurrect "git apply --flags -" to read from the standard input
8135 git-am: add --directory=<dir> option
8136 Update 1.6.2 draft release notes
8137 git-am: fix shell quoting
8138 checkout: implement "@{-N}" shortcut name for N-th last branch
8139 git-am: re-fix the diag message printing
8140 interpret_nth_last_branch(): avoid traversing the reflog twice
8141 Fix reflog parsing for a malformed branch switching entry
8142 interpret_nth_last_branch(): plug small memleak
8143 Introduce for_each_recent_reflog_ent().
8144 Simplify parsing branch switching events in reflog
8145 http-push.c: style fixes
8146 am: Add --committer-date-is-author-date option
8147 rebase -i: correctly remember --root flag across --continue
8148 tests: Avoid single-shot environment export for shell function invocation
8149 revision traversal: allow UNINTERESTING objects to be missing
8150 rebase -i squashes submodule changes into unrelated commit
8151 add -u: do not fail to resolve a path as deleted
8152 Update draft release notes to 1.6.2
8153 fsck: HEAD is part of refs
8154 fsck: check loose objects from alternate object stores by default
8155 http-push.c: get_remote_object_url() is only used under USE_CURL_MULTI
8156 receive-pack: explain what to do when push updates the current branch
8157 t3412: further simplify setting of GIT_EDITOR
8158 tests: fix test_commit() for case insensitive filesystems
8159 Makefile: fix misdetection of relative pathnames
8163 test more combinations of ignore-whitespace options to diff
8166 mailinfo: correctly handle multiline 'Subject:' header
8167 mailinfo: 'From:' header should be unfold as well
8168 mailinfo: add explicit test for mails like '<a.u.thor@example.com> (A U Thor)'
8169 mailinfo: tests for RFC2047 examples
8170 mailinfo: cleanup extra spaces for complex 'From:'
8173 Cleanup of unused symcache variable inside diff-lib.c
8174 lstat_cache(): more cache effective symlink/directory detection
8175 lstat_cache(): introduce has_symlink_or_noent_leading_path() function
8176 lstat_cache(): introduce has_dirs_only_path() function
8177 lstat_cache(): introduce invalidate_lstat_cache() function
8178 lstat_cache(): introduce clear_lstat_cache() function
8181 bash completion: Add '--intent-to-add' long option for 'git add'
8182 bash completion: Use 'git add' completions for 'git stage'
8185 Add 'merge' mode to 'git reset'
8188 git-svn: Show UUID in svn info for added directories with svn 1.5.5
8190 Markus Heidelberg (10):
8191 git-cherry: make <upstream> parameter optional
8192 Documentation: clarify which parameters are optional to git-cherry
8193 contrib/vim: change URL to point to the latest syntax files
8194 Documentation: let asciidoc align related options
8195 mergetool: put the cursor on the editable file for Vim
8196 contrib/difftool: change trap condition from SIGINT to INT
8197 contrib/difftool: remove distracting 'echo' in the SIGINT handler
8198 use uppercase POSIX compliant signals for the 'trap' command
8199 bash completion: add 'rename' subcommand to git-remote
8200 contrib/difftool: add support for Kompare
8203 gitweb: unify boolean feature subroutines
8205 Michele Ballabio (1):
8206 git-shortlog.txt: fix example about .mailmap
8209 Add support for a pdf version of the user manual
8210 parse-opt: migrate builtin-apply.
8211 gittutorial: remove misleading note
8213 Nanako Shiraishi (3):
8214 git-am: Add --ignore-date option
8215 Mention "local convention" rule in the CodingGuidelines
8216 git-bundle doc: update examples
8219 autodetect number of CPUs by default when using threads
8220 pack-objects: don't use too many threads with few objects
8223 config.mak.in: define paths without trailing slash
8226 git-svn: Add --localtime option to "fetch"
8228 Pierre Habouzit (1):
8229 filter-branch: add git_commit_non_empty_tree and --prune-empty.
8231 Ralf Wildenhues (1):
8232 Fix naming scheme for configure cache variables.
8235 http-push: refactor lock-related headers creation for curl requests
8238 diff: add option to show context between close hunks
8239 strbuf: instate cleanup rule in case of non-memory errors
8240 grep -w: forward to next possible position after rejected match
8241 grep: don't call regexec() for fixed strings
8244 Change NUL char handling of isspecial()
8245 Add is_regex_special()
8246 Optimize color_parse_mem
8249 bash: add '--merge' to 'git reset'
8250 bash: remove unnecessary checks for long options with argument
8251 bash: add missing format-patch command line options
8252 bash: refactor 'git log --pretty=<format>' options
8255 commit: more compact summary and without extra quotes
8256 tutorial-2: Update with the new "git commit" ouput
8258 Serge van den Boom (1):
8259 Makefile: Make 'configure --with-expat=path' actually work
8261 Stefan Karpinski (2):
8262 git-cvsserver: handle CVS 'noop' command.
8263 git-cvsserver: run post-update hook *after* update.
8265 Steffen Prohaska (6):
8266 Move computation of absolute paths from Makefile to runtime (in preparation for RUNTIME_PREFIX)
8267 git_extract_argv0_path(): Move check for valid argv0 from caller to callee
8268 Add calls to git_extract_argv0_path() in programs that call git_config_*
8269 Modify setup_path() to only add git_exec_path() to PATH
8270 Compute prefix at runtime if RUNTIME_PREFIX is set
8271 Windows: Revert to default paths and convert them by RUNTIME_PREFIX
8274 checkout: don't crash on file checkout before running post-checkout hook
8275 Move run_hook() from builtin-commit.c into run-command.c (libgit)
8276 api-run-command.txt: talk about run_hook()
8277 run_hook(): check the executability of the hook before filling argv
8278 run_hook(): allow more than 9 hook arguments
8281 Refactor git_set_argv0_path() to git_extract_argv0_path()
8283 Sverre Rabbelier (1):
8284 Allow cloning an empty repository
8287 http-push: refactor request url creation
8288 http-push: add back underscore separator before lock token
8289 http-push: wrap signature of get_remote_object_url
8292 bash-completion: Support running when set -u is enabled
8293 bash-completion: Try bash completions before simple filetype
8294 bash-completion: Add comments to remind about required arguments
8295 make: Remove -pthread on Darwin (it is included by cstdlib).
8298 Fix the building of user-manual.texi and gitman.texi documents
8299 Fix the building of gitman.info document
8300 diff-options.txt: Fix asciidoc markup issue
8303 rebase -i: execute hook only after argument checking
8304 rebase: learn to rebase root commit
8305 rebase -i: learn to rebase root commit
8306 rebase: update documentation for --root
8307 notes: fix core.notesRef documentation
8308 color-words: enable REG_NEWLINE to help user
8309 color-words: expand docs with precise semantics
8310 color-words: make regex configurable via attributes
8311 sha1_name: tweak @{-N} lookup
8312 sha1_name: support @{-N} syntax in get_sha1()
8313 checkout: implement "-" abbreviation, add docs and tests
8314 bash completion: move pickaxe options to log
8315 bash completion: refactor diff options
8316 t1505: remove debugging cruft
8317 t3412: clean up GIT_EDITOR usage
8318 t3412: use log|name-rev instead of log --graph
8319 bash: offer to show (un)staged changes
8320 add -p: change prompt separator for 'g'
8321 add -p: trap Ctrl-D in 'goto' mode
8322 contrib git-resurrect: find traces of a branch name and resurrect it
8323 add -p: prompt for single characters
8324 add -p: print errors in separate color
8325 add -p: import Term::ReadKey with 'require'
8327 Tor Arne Vestbø (1):
8328 git-notes: fix printing of multi-line notes
8330 Vitaly "_Vi" Shukela (3):
8331 git-svn: add --ignore-paths option for fetching
8332 git-svn: documented --ignore-paths
8333 git-svn: Add test for --ignore-paths parameter
8335 William Pursell (5):
8336 Add subroutine to display one-line summary of hunks
8337 Add 'g' command to go to a hunk
8338 git-add -i/-p: Change prompt separater from slash to comma
8339 Add / command in add --patch
8340 In add --patch, Handle K,k,J,j slightly more gracefully.
8342 jidanni@jidanni.org (1):
8343 git-show-branch doc: show -g as synonym to --reflog in the list
8345 martin f. krafft (1):
8346 git-am: implement --reject option passed to git-apply
8349 Version v1.6.1.3; changes since v1.6.1.2:
8350 -----------------------------------------
8352 Anders Melchiorsen (2):
8353 Documentation: more git push examples
8354 Documentation: rework src/dst description in git push
8356 David J. Mellor (1):
8357 Fixed broken git help -w when installing from RPM
8360 fix typo in Documentation
8361 add test-dump-cache-tree in Makefile
8363 Johannes Schindelin (2):
8364 revision walker: include a detached HEAD in --all
8365 apply: fix access to an uninitialized mode variable, found by valgrind
8368 bundle: allow the same ref to be given more than once
8369 Documentation: simplify refspec format description
8370 diff.c: output correct index lines for a split diff
8371 builtin-apply.c: do not set bogus mode in check_preimage() for deleted path
8372 grep: pass -I (ignore binary) down to external grep
8376 test more combinations of ignore-whitespace options to diff
8377 Fix combined use of whitespace ignore options to diff
8380 Wrap inflate and other zlib routines for better error reporting
8383 Missing && in t/t7001.sh.
8384 Add a testcase for "git mv -f" on untracked files.
8385 builtin-mv.c: check for unversionned files before looking at the destination.
8388 merge: fix out-of-bounds memory access
8391 Fix gitdir detection when in subdir of gitdir
8394 urls.txt: document optional port specification in git URLS
8396 William Pursell (1):
8397 User-manual: "git stash <comment>" form is long gone
8400 Version v1.6.1.2; changes since v1.6.1.1:
8401 -----------------------------------------
8403 Björn Steinbrink (1):
8404 Rename detection: Avoid repeated filespec population
8407 avoid 31-bit truncation in write_loose_object
8409 Johannes Schindelin (2):
8410 get_sha1_basic(): fix invalid memory access, found by valgrind
8411 test-path-utils: Fix off by one, found by valgrind
8414 ls-tree: add --full-tree option
8415 Teach format-patch to handle output directory relative to cwd
8416 send-pack: do not send unknown object name from ".have" to pack-objects
8420 git-sh-setup: Fix scripts whose PWD is a symlink to a work-dir on OS X
8422 Markus Heidelberg (2):
8423 git-commit: color status output when color.ui is set
8424 git-status -v: color diff output when color.ui is set
8426 Nanako Shiraishi (1):
8427 Document git-ls-tree --full-tree
8429 Nguyễn Thái Ngọc Duy (2):
8430 grep: support --no-ext-grep to test builtin grep
8431 grep: grep cache entries if they are "assume unchanged"
8434 objects to be pruned immediately don't have to be loosened
8437 Version v1.6.1.1; changes since v1.6.1:
8438 ---------------------------------------
8441 git-shortlog.txt: improve documentation about .mailmap files
8442 git-send-email.txt: move --format-patch paragraph to a proper location
8444 Anders Melchiorsen (4):
8445 Documentation: git push repository can also be a remote
8446 Documentation: remove a redundant elaboration
8447 Documentation: mention branches rather than heads
8448 Documentation: avoid using undefined parameters
8450 Boyd Stephen Smith Jr (1):
8451 Fix Documentation for git-describe
8453 Christian Couder (1):
8454 builtin-fsck: fix off by one head count
8456 Clemens Buchacher (4):
8457 modify/delete conflict resolution overwrites untracked file
8458 unpack-trees: handle failure in verify_absent
8459 unpack-trees: fix path search bug in verify_absent
8460 unpack-trees: remove redundant path search in verify_absent
8463 gitweb: Fix export check in git_get_projects_list
8465 Felipe Contreras (1):
8466 fast-import: Cleanup mode setting.
8469 Use capitalized names where appropriate
8470 Be consistent in switch usage for tar
8473 Git.pm: call Error::Simple() properly
8476 README: tutorial.txt is now called gittutorial.txt
8478 Johannes Schindelin (7):
8479 merge-recursive: mark rename/delete conflict as unmerged
8480 bisect view: call gitk if Cygwin's SESSIONNAME variable is set
8481 git add: do not add files from a submodule
8482 http-push: fix off-by-path_len
8483 http-push: when making directories, have a trailing slash in the path name
8484 t5540: clarify that http-push does not handle packed-refs on the remote
8485 Rename diff.suppress-blank-empty to diff.suppressBlankEmpty
8488 merge-recursive: do not clobber untracked working tree garbage
8489 Prepare for v1.6.1.1 maintenance release
8490 builtin-apply: prevent non-explicit permission changes
8491 git checkout: do not allow switching to a tree-ish that is not a commit
8492 format-patch: show patch text for the root commit
8493 Update draft release notes to 1.6.1.1
8494 Update draft release notes for 1.6.1.1
8497 Kirill A. Korinskiy (1):
8498 http-push: support full URI in handle_remote_ls_ctx()
8500 Lars Noschinski (1):
8501 shell: Document that 'cvs server' is a valid command
8503 Markus Heidelberg (2):
8504 doc/git-send-email: mention sendemail.cc config variable
8505 Documentation: let asciidoc align related options
8507 Michael J Gruber (2):
8508 add test cases for "git mv -k"
8509 fix handling of multiple untracked files for git mv -k
8512 fast-export: print usage when no options specified
8513 Make t3411 executable
8516 configure clobbers LDFLAGS
8518 Philippe Bruhat (1):
8519 Git.pm: correctly handle directory name that evaluates to "false"
8521 Pierre Habouzit (1):
8522 Avoid spurious error messages on error mistakes.
8525 daemon: handle freopen() failure
8526 daemon: cleanup: replace loop with if
8527 daemon: cleanup: factor out xstrdup_tolower()
8528 merge-file: handle freopen() failure
8529 pretty: factor out skip_empty_lines()
8530 pretty: factor out format_subject()
8531 pretty: support multiline subjects with format:
8532 shortlog: handle multi-line subjects like log --pretty=oneline et. al. do
8534 Shawn O. Pearce (1):
8535 describe: Avoid unnecessary warning when using --all
8538 t3501: check that commits are actually done
8539 t3404: Add test case for aborted --continue after "edit"
8540 t3404: Add test case for auto-amending only edited commits after "edit"
8541 builtin-commit.c: do not remove COMMIT_EDITMSG
8542 githooks.txt: add missing word
8545 diff: accept -- when using --no-index
8546 diff --no-index: test for pager after option parsing
8547 diff --no-index -q: fix endless loop
8549 jidanni@jidanni.org (4):
8550 Documentation/diff-options.txt: unify options
8551 Documentation/git-tag.txt: minor typo and grammar fix
8552 Documentation/git-push.txt: minor: compress one option
8553 contrib/examples/README: give an explanation of the status of these files
8556 Version v1.6.1; changes since v1.6.0.6:
8557 ---------------------------------------
8559 Abhijit Menon-Sen (1):
8560 Make cherry-pick use rerere for conflict resolution.
8563 Extend "checkout --track" DWIM to support more cases
8564 Remove calculation of the longest command name from where it is not used
8565 Remove useless memset of static command name lists in builtin-merge.c
8566 Make main_cmds and other_cmds local to builtin-help.c
8567 Allow git help work without PATH set
8568 list_commands: only call git_exec_path if it is needed
8569 Add help.autocorrect to enable/disable autocorrecting
8571 Fix potentially dangerous uses of mkpath and git_path
8572 Fix handle leak in sha1_file/unpack_objects if there were damaged object data
8573 Fix t4030-diff-textconv.sh
8574 Make some of fwrite/fclose/write/close failures visible
8575 Make chdir failures visible
8576 Report symlink failures in merge-recursive
8578 Alexander Gavrilov (63):
8579 git-gui: Support starting gitk from Gui Blame
8580 git-gui: Support passing blame to a parent commit.
8581 git-gui: Better positioning in Blame Parent Commit
8582 git-gui: Allow specifying an initial line for git gui blame.
8583 gitk: Add option to specify the default commit on command line
8584 gitk: Add menu item for calling git gui blame
8585 git-gui: Support resolving conflicts via the diff context menu.
8586 git-gui: Support calling merge tools.
8587 git-gui: Don't allow staging files with conflicts.
8588 git-gui: Support more merge tools.
8589 git-gui: Support conflict states _U & UT.
8590 git-gui: Reimplement and enhance auto-selection of diffs.
8591 git-gui: Make F5 reselect a diff, if an untracked file is selected.
8592 git-gui: Show special diffs for complex conflict cases.
8593 git-gui: Fix Blame Parent & Context for working copy lines.
8594 git-gui: Restore ability to Stage Working Copy for conflicts.
8595 gitk: Fix a bug in collapsing deeply nested trees
8596 git-gui: Add more integration options to citool.
8597 git-gui: Cleanup handling of the default encoding.
8598 git-gui: Add a menu of available encodings.
8599 git-gui: Allow forcing display encoding for diffs using a submenu.
8600 git-gui: Optimize encoding name resolution using a lookup table.
8601 git-gui: Support the encoding menu in gui blame.
8602 git-gui: Reenable staging unmerged files by clicking the icon.
8603 git-gui: Make Ctrl-T safe to use for conflicting files.
8604 git-gui: Fix the blame window shape.
8605 git-gui: Add a search command to the blame viewer.
8606 git-gui: Fix the blame viewer destroy handler.
8607 gitk: Enhance file encoding support
8608 gitk: Implement batch lookup and caching of encoding attrs
8609 gitk: Allow forcing branch creation if it already exists
8610 gitk: Fix file list context menu for merge commits
8611 builtin-blame: Reencode commit messages according to git-log rules.
8612 gitk: Allow starting gui blame for a specific line
8613 git-gui: Add a dialog that shows the OpenSSH public key.
8614 git-gui: Add a simple implementation of SSH_ASKPASS.
8615 Windows: Make OpenSSH properly detect tty detachment.
8616 gitweb: Use single implementation of export_ok check.
8617 gitweb: Add a per-repository authorization hook.
8618 gitweb: Fix mod_perl support.
8619 gitk: Add Return and Escape bindings to dialogs
8620 gitk: Make gitk dialog windows transient
8621 gitk: Make cherry-pick call git-citool on conflicts
8622 gitk: Implement a user-friendly Edit View dialog
8623 git-gui: Fix focus transition in the blame viewer.
8624 git-gui: Add the Show SSH Key item to the clone dialog.
8625 git-gui: Request blame metadata in utf-8.
8626 gitk: Add accelerators to frequently used menu commands
8627 gitk: Fix transient windows on Win32 and MacOS
8628 gitk: Fix commit encoding support
8629 Documentation: New GUI configuration and command-line options.
8630 git-gui: Implement system-wide configuration handling.
8631 git-gui: Fix the after callback execution in rescan.
8632 git-gui: Add a Tools menu for arbitrary commands.
8633 git-gui: Allow Tools request arguments from the user.
8634 git-gui: Implement automatic rescan after Tool execution.
8635 git-gui: Fix the search bar destruction handler.
8636 gitk: Avoid handling the Return key twice in Add Branch
8637 gitk: Make line origin search update the busy status
8638 gitk: Add a menu option to start git gui
8639 git-gui: Fix handling of relative paths in blame.
8640 git-gui: Fix commit encoding handling.
8641 Documentation: Describe git-gui Tools menu configuration options.
8643 Alexander Potashev (2):
8644 Fix typos in documentation
8645 Fix typo in comment in builtin-add.c
8647 Alexandre Julliard (9):
8648 git.el: Improve error handling for commits.
8649 git.el: Remove the env parameter in git-call-process and git-call-process-string.
8650 git.el: Simplify handling of merge heads in the commit log-edit buffer.
8651 git.el: Properly handle merge commits in git-amend-commit.
8652 git.el: Fix git-amend-commit to support amending an initial commit.
8653 git.el: Never clear the status buffer, only update the files.
8654 git.el: Add an insert file command.
8655 git.el: Add possibility to mark files directly in git-update-status-files.
8656 git.el: Allow to commit even if there are no marked files.
8658 Alexey Borzenkov (1):
8659 Define linkgit macro in [macros] section
8661 Anders Melchiorsen (2):
8662 wt-status: Split header generation into three functions
8663 wt-status: Teach how to discard changes in the working directory
8665 Andreas Ericsson (3):
8666 Teach "git diff -p" to locate PHP class methods
8667 git commit: Reformat output somewhat
8668 rebase: Support preserving merges in non-interactive mode
8670 Arjen Laarhoven (2):
8671 t6023-merge-file: Work around non-portable sed usage
8672 Enable threaded delta search on Mac OS X/Darwin
8675 for-each-ref: `:short` format for `refname`
8677 Boyd Stephen Smith Jr (1):
8678 git-revert documentation: refer to new HOWTO on reverting faulty merges
8681 remote.c: add a function for deleting a refspec array and use it (twice)
8682 dir.c: Avoid c99 array initialization
8683 t4018-diff-funcname: test syntax of builtin xfuncname patterns
8684 diff.c: remove duplicate bibtex pattern introduced by merge 92bb9785
8685 xdiff-interface.c: strip newline (and cr) from line before pattern matching
8686 Replace xmalloc/memset(0) pairs with xcalloc
8687 t9001: use older Getopt::Long boolean prefix '--no' rather than '--no-'
8688 Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer
8689 t4018-diff-funcname: add objective-c xfuncname pattern to syntax test
8690 git-branch: display sha1 on branch deletion
8693 Make xdi_diff_outf interface for running xdiff_outf diffs
8694 Use strbuf for struct xdiff_emit_state's remainder
8695 Always initialize xpparam_t to 0
8696 Allow alternate "low-level" emit function from xdl_diff
8698 Brian Gernhardt (2):
8699 format-patch: autonumber by default
8700 Avoid using non-portable `echo -n` in tests.
8703 git-remote: match usage string with the manual pages
8704 git-remote: add verbose mode to git remote update
8706 Christian Couder (12):
8707 merge-base: teach "git merge-base" to drive underlying merge_bases_many()
8708 bisect: test merge base if good rev is not an ancestor of bad rev
8709 bisect: only check merge bases when needed
8710 bisect: remove "checkout_done" variable used when checking merge bases
8711 refs: improve comments about "reading" argument of "resolve_ref"
8712 bisect: fix missing "exit"
8713 Documentation: user-manual: add information about "git help" at the beginning
8714 Documentation: tutorial: add information about "git help" at the beginning
8715 git-gui: french translation update
8716 bisect: teach "skip" to accept special arguments like "A..B"
8717 bisect: fix "git bisect skip <commit>" and add tests cases
8718 Documentation: describe how to "bisect skip" a range of commits
8720 Christian Stimming (9):
8721 git-gui: Mark forgotten strings for translation.
8722 git-gui: I18n fix sentence parts into full sentences for translation again.
8723 git-gui: Updated German translation.
8724 gitk: Add untranslated error messages to translation
8725 git-gui: Update German translation.
8726 gitk: Update German translation
8727 git-gui: Update German (completed) translation.
8728 gitk: Mark forgotten strings (header sentence parts in color chooser) for translation
8729 gitk: Update German translation
8732 git-merge documentation: more details about resolving conflicts
8735 Fix non-literal format in printf-style calls
8738 git-submodule: replace duplicated code with a module_list function
8739 git-submodule: add "sync" command
8740 tests: add a testcase for "git submodule sync"
8743 Use "git_config_string" to simplify "builtin-gc.c" code where "prune_expire" is set
8745 David M. Syzdek (5):
8746 Build: add NO_UINTMAX_T to support ancient systems
8747 Add Makefile check for FreeBSD 4.9-SECURITY
8748 autoconf: Add link tests to each AC_CHECK_FUNC() test
8749 Make Pthread link flags configurable
8750 Add autoconf tests for pthreads
8752 David Soria Parra (1):
8753 cast pid_t's to uintmax_t to improve portability
8756 git-diff: Add --staged as a synonym for --cached.
8759 xdiff: give up scanning similar lines early
8762 git-svn: testcase for partial rebuild
8763 git-svn: do a partial rebuild if rev_map is out-of-date
8764 git-svn: proper detection of bare repositories
8765 git-svn: proper detection of bare repositories
8766 git-svn: Make branch use correct svn-remote
8768 Dmitry Potapov (14):
8769 teach index_fd to work with pipes
8770 correct argument checking test for git hash-object
8771 correct usage help string for git-hash-object
8772 use parse_options() in git hash-object
8773 add --path option to git hash-object
8774 add --no-filters option to git hash-object
8775 mingw: remove use of _getdrive() from lstat/fstat
8776 add have_git_dir() function
8777 mingw: move common functionality to win32.h
8778 cygwin: Use native Win32 API for stat
8779 do not segfault if make_cache_entry failed
8780 print an error message for invalid path
8781 check-attr: add an internal check_attr() function
8782 check-attr: Add --stdin option
8785 Use xmalloc() and friends to catch allocation failures
8788 git-svn: check error code of send_txstream
8789 t9124: clean up chdir usage
8790 git-svn: fix handling of even funkier branch names
8791 git-svn: don't escape tilde ('~') for http(s) URLs
8792 git-svn: respect i18n.commitencoding config
8793 git-svn: don't escape tilde ('~') for http(s) URLs
8794 git-svn: respect i18n.commitencoding config
8796 Florian Ragwitz (1):
8797 Add git-svn branch to allow branch creation in SVN repositories
8800 git-svn: extract base blob in generate_diff
8801 git-svn: Introduce SVN::Git::Editor::_chg_file_get_blob
8802 git-svn: Send deltas during commits
8804 Fredrik Skolmli (2):
8805 Documentation: Spelling fix
8806 git-gui: Starting translation for Norwegian
8809 Fixed some grammatical errors in git-rebase.txt documentation.
8811 Giovanni Funchal (1):
8812 configure: auto detect dynamic library path switches
8814 Giuseppe Bilotta (15):
8815 gitweb: ref markers link to named shortlogs
8816 gitweb: shortlog now also obeys $hash_parent
8817 gitweb: refactor input parameters parse/validation
8818 gitweb: parse project/action/hash_base:filename PATH_INFO
8819 gitweb: generate project/action/hash URLs
8820 gitweb: use_pathinfo filenames start with /
8821 gitweb: parse parent..current syntax from PATH_INFO
8822 gitweb: generate parent..current URLs
8823 gitweb: make the supported snapshot formats array global
8824 gitweb: retrieve snapshot format from PATH_INFO
8825 gitweb: embed snapshot format parameter in PATH_INFO
8826 git-gui: try to provide a window icon under X
8827 gitweb: make gitweb_check_feature a boolean wrapper
8828 Update comment on gitweb_check/get_feature
8829 gitk: Map / to focus the search box
8832 Update .gitignore to ignore git-help
8833 git-gui: Teach git gui about file type changes
8836 diff --dirstat-by-file: count changed files, not lines
8839 gitweb: Better processing format string in custom links in navbar
8840 gitweb: Fix handling of non-ASCII characters in inserted HTML files
8841 gitweb: Fix bug in insert_file() subroutine
8844 Introduce receive.denyDeletes
8847 run-command: add pre-exec callback
8848 spawn pager via run_command interface
8849 format-patch: use default diff format even with patch options
8850 tests: grep portability fixes
8851 reformat informational commit message
8852 tutorial: update output of git commit
8853 tests: shell negation portability fix
8854 t4012: use test_cmp instead of cmp
8855 diff: unify external diff and funcname parsing code
8856 diff: introduce diff.<driver>.binary
8857 diff: add filter for converting binary to text
8858 document "intent to add" option to git-add
8859 rm: loosen safety valve for empty files
8860 submodule: fix some non-portable grep invocations
8861 diff: add missing static declaration
8862 document the diff driver textconv feature
8863 refactor userdiff textconv code
8864 userdiff: require explicitly allowing textconv
8865 only textconv regular files
8866 wt-status: load diff ui config
8867 add userdiff textconv tests
8868 enable textconv for diff in verbose status/commit
8869 t5400: expect success for denying deletion
8870 t5516: refactor oddball tests
8871 receive-pack: detect push to current branch of non-bare repo
8872 define empty tree sha1 as a macro
8873 wt-status: refactor initial commit printing
8874 status: show "-v" diff even for initial commit
8875 add stage to gitignore
8876 reorder ALLOW_TEXTCONV option setting
8877 diff: allow turning on textconv explicitly for plumbing
8878 diff: fix handling of binary rewrite diffs
8879 diff: respect textconv in rewrite diffs
8880 rebase: improve error messages about dirty state
8883 add boolean diff.suppress-blank-empty config option
8884 SubmittingPatches: fix a typo
8885 reword --full-index description
8886 xdiff-interface.c: remove 10 duplicated lines
8889 git-daemon: set REMOTE_ADDR to client address
8890 sha1_file: avoid bogus "file exists" error message
8893 Teach "git diff -p" HTML funcname patterns
8894 Fix AsciiDoc errors in merge documentation
8895 Fix submodule sync with relative submodule URLs
8897 Johannes Schindelin (10):
8898 t9700: remove useless check
8899 tests: Clarify dependencies between tests, 'aggregate-results' and 'clean'
8900 Enable parallel tests
8901 checkout --track: make up a sensible branch name if '-b' was omitted
8902 test-lib: do not remove trash_directory if called with --debug
8903 git wrapper: DWIM mistyped commands
8904 Document levenshtein.c
8905 Get rid of the last remnants of GIT_CONFIG_LOCAL
8906 git-gui: Get rid of the last remnants of GIT_CONFIG_LOCAL
8907 rebase -i -p: leave a --cc patch when a merge could not be redone
8910 Revert "Windows: Use a customized struct stat that also has the st_blocks member."
8911 filter-branch: Grok special characters in tag names
8912 Windows: git-shell can be compiled again
8913 compat/mingw: Support a timeout in the poll emulation if no fds are given
8914 git-gui: Do not automatically stage file after merge tool finishes
8915 git-gui: Remove space from the end of aspell's reply before processing
8916 git-gui: Fix switch statement in lib/merge.tcl
8917 git-gui: Show a round number of bytes of large untracked text files
8918 git-gui: Mark-up strings in show_{other,unmerged}_diff() for localization
8919 git-remote: list branches in vertical lists
8920 git-gui: Do not munge conflict marker lines in a normal diff
8921 t4030-diff-textconv: Make octal escape sequence more portable
8922 Show a failure of rebase -p if the merge had a conflict
8923 rebase -i -p: Fix --continue after a merge could not be redone
8924 gitk: Use check-buttons' -text property instead of separate labels
8925 gitk: Ensure that "Reset branch" menu entry is enabled
8926 gitk: Force the focus to the main window on Windows
8929 git-p4: Support purged files and optimize memory usage
8930 git-p4: Cache git config for performance
8933 git-check-attr(1): use 'verse' for multi-line synopsis sections
8935 Jonathan del Strother (3):
8936 Revert "Convert output messages in merge-recursive to past tense."
8937 Add OS X support to the pre-auto-gc example hook
8938 Teach git diff about Objective-C syntax
8940 Joshua Williams (1):
8941 git-gui: Add support for calling out to the prepare-commit-msg hook
8943 Junio C Hamano (105):
8944 builtin-add.c: restructure the code for maintainability
8945 builtin-add.c: optimize -A option and "git add ."
8946 imap-send.c: more style fixes
8947 documentation: merge-base: explain "git merge-base" with more than 2 args
8948 merge-base-many: add trivial tests based on the documentation
8949 git-merge-octopus: use (merge-base A (merge B C D E...)) for stepwise merge
8950 revision.c: whitespace fix
8951 revision traversal: show full history with merge simplification
8952 Topo-sort before --simplify-merges
8953 update-index: refuse to add working tree items beyond symlinks
8954 add: refuse to add working tree items beyond symlinks
8955 xdiff-interface: hide the whole "xdiff_emit_state" business from the caller
8956 revision --simplify-merges: use decoration instead of commit->util field
8957 index: future proof for "extended" index entries
8958 tests: use $TEST_DIRECTORY to refer to the t/ directory
8960 Makefile: Allow CC_LD_DYNPATH to be overriden
8961 revision --simplify-merges: do not leave commits unprocessed
8962 revision --simplify-merges: make it a no-op without pathspec
8963 compat: introduce on_disk_bytes()
8964 shell: do not play duplicated definition games to shrink the executable
8965 Build-in "git-shell"
8966 Update draft release notes for 1.6.1
8967 Fix "git-merge -s bogo" help text
8968 templates/Makefile: install is unnecessary, just use mkdir -p
8969 t7606: fix custom merge test
8970 Revert "Build-in "git-shell""
8971 daemon.c: minor style fixup
8972 checkout -f: allow ignoring unmerged paths when checking out of the index
8973 checkout --ours/--theirs: allow checking out one side of a conflicting merge
8974 xdl_fill_merge_buffer(): separate out a too deeply nested function
8975 xdiff-merge: optionally show conflicts in "diff3 -m" style
8976 xmerge.c: minimum readability fixups
8977 xmerge.c: "diff3 -m" style clips merge reduction level to EAGER or less
8978 rerere.c: use symbolic constants to keep track of parsing states
8979 rerere: understand "diff3 -m" style conflicts with the original
8980 merge.conflictstyle: choose between "merge" and "diff3 -m" styles
8981 git-merge-recursive: learn to honor merge.conflictstyle
8982 checkout -m: recreate merge when checking out of unmerged index
8983 diff: vary default prefix depending on what are compared
8984 git commit --author=$name: look $name up in existing commits
8985 git-add --intent-to-add (-N)
8986 checkout --conflict=<style>: recreate merge in a non-default style
8987 git-merge documentation: describe how conflict is presented
8988 Update draft release notes for 1.6.1
8989 safe_create_leading_directories(): make it about "leading" directories
8990 git-apply:--include=pathspec
8991 Update draft release notes for 1.6.1
8992 daemon.c: avoid setlinebuf()
8993 is_directory(): a generic helper function
8994 receive-pack: make it a builtin
8995 push: prepare sender to receive extended ref information from the receiver
8996 push: receiver end advertises refs from alternate repositories
8997 Fix git-diff-tree --stdin
8998 diff: use extended regexp to find hunk headers
8999 diff: fix "multiple regexp" semantics to find hunk header comment
9000 Update draft release notes to 1.6.1
9001 t5510: test "git fetch" following tags minimally
9002 Update draft release notes to 1.6.1
9003 Fix reading of cloud tags
9004 Update draft release notes for 1.6.1
9005 Fix mismerge at cdb22c4 in builtin-checkout.c
9006 rebase-i-p: minimum fix to obvious issues
9007 git-rebase--interactive.sh: comparision with == is bashism
9008 receive-pack: fix "borrowing from alternate object store" implementation
9009 compat/cygwin.c: make runtime detection of lstat/stat lessor impact
9010 Stop using compat/regex.c on platforms with working regexp library
9011 Update draft release notes to 1.6.1
9012 Update draft release notes to 1.6.1
9013 Update draft release notes to 1.6.1
9014 t5303: work around printf breakage in dash
9015 t5303: fix printf format string for portability
9016 git.html: Update the links to stale versions
9017 Update draft release notes to 1.6.1
9018 builtin-remote.c: plug a small memory leak in get_one_remote_for_updates()
9019 builtin-rm.c: explain and clarify the "local change" logic
9020 git add --intent-to-add: fix removal of cached emptiness
9021 git add --intent-to-add: do not let an empty blob be committed by accident
9022 gitweb: fix 'ctags' feature check and others
9023 gitweb: rename gitweb_check_feature to gitweb_get_feature
9024 send-email: do not reverse the command line arguments
9025 Include git-gui--askpass in git-gui RPM package
9027 Makefile: introduce NO_PTHREADS
9028 Install git-stage in exec-path
9029 git-am --whitespace: do not lose the command line option
9030 git-am: propagate -C<n>, -p<n> options as well
9031 git-am: propagate --3way options as well
9032 Test that git-am does not lose -C/-p/--whitespace options
9033 git-am: rename apply_opt_extra file to apply-opt
9034 Update draft release notes to 1.6.1
9035 Update draft release notes for 1.6.1
9036 Revert "git-stash: use git rev-parse -q"
9037 Point "stale" 1.6.0.5 documentation from the main git documentation page
9038 builtin-checkout.c: check error return from read_cache()
9039 read-cache.c: typofix in comment
9041 gitweb: do not run "git diff" that is Porcelain
9042 make_absolute_path(): check bounds when seeing an overlong symlink
9043 builtin-blame.c: use strbuf_readlink()
9044 combine-diff.c: use strbuf_readlink()
9045 Make sure lockfiles are unlocked when dying on SIGPIPE
9046 send-email: futureproof split_addrs() sub
9050 Karl Hasselström (4):
9051 Refactoring: Split up diff_tree_stdin
9052 diff-tree: Note that the commit ID is printed with --stdin
9053 Teach git diff-tree --stdin to diff trees
9054 Add test for diff-tree --stdin with two trees
9057 gitk: Allow unbalanced quotes/braces in commit headers
9059 Kirill A. Korinskiy (1):
9060 Remove the requirement opaquelocktoken uri scheme
9063 Teach "git diff -p" Python funcname patterns
9066 bash completion: Add 'workflows' to 'git help'
9067 workflows documentation: fix link to git-request-pull[1]
9068 bash completion: Sort config completion variables
9069 bash completion: Sync config variables with their man pages
9071 Linus Torvalds (14):
9072 date/time: do not get confused by fractional seconds
9073 Add a 'source' decorator for commits
9074 revision: make tree comparison functions take commits rather than trees
9075 Make '--decorate' set an explicit 'show_decorations' flag
9076 revision traversal: '--simplify-by-decoration'
9077 Add cache preload facility
9078 Fix machine-parseability of 'git log --source'
9079 Fix index preloading for racy dirty case
9080 Add backslash to list of 'crud' characters in real name
9081 Add generic 'strbuf_readlink()' helper function
9082 Make 'ce_compare_link()' use the new 'strbuf_readlink()'
9083 Make 'index_path()' use 'strbuf_readlink()'
9084 Make 'diff_populate_filespec()' use the new 'strbuf_readlink()'
9085 Make 'prepare_temp_file()' ignore st_size for symlinks
9088 t9129-git-svn-i18n-commitencoding: Make compare_svn_head_with() compatible with OSX sed
9091 git-sh-setup: Fix scripts whose PWD is a symlink into a git work-dir
9094 count-objects: Add total pack size to verbose output
9095 Update t/.gitignore to ignore all trash directories
9098 Make push more verbose about illegal combination of options
9101 Documentation: rev-list-options.txt: added --branches, --tags & --remotes.
9102 git-commit.txt - mention that files listed on the command line must be known to git.
9103 git-gui: Teach start_push_anywhere_action{} to notice when remote is a mirror.
9106 git-submodule - Add 'foreach' subcommand
9107 git-submodule.sh - Remove trailing / from URL if found
9108 git-submodule.sh - Remove trailing / from URL if found
9109 git-submodule - Use "get_default_remote" from git-parse-remote
9110 compat/cygwin.c - Use cygwin's stat if core.filemode == true
9112 Markus Heidelberg (8):
9113 Makefile: add install-man rules (quick and normal)
9114 builtin-commit: remove unused message variable
9115 Documentation: fix description for enabling hooks
9116 doc/git-reset: add reference to git-stash
9117 Documentation: sync example output with git output
9118 Documentation: fix typos, grammar, asciidoc syntax
9119 Documentation/git-show-branch: work around "single quote" typesetting glitch
9120 doc/git-fsck: change the way for getting heads' SHA1s
9122 Marten Svanfeldt (dev) (2):
9123 Git.pm: Make _temp_cache use the repository directory
9124 git-svn: Update git-svn to use the ability to place temporary files within repository directory
9127 "git diff <tree>{3,}": do not reverse order of arguments
9128 git-merge-recursive: honor merge.conflictstyle once again
9130 Matthias Kestenholz (1):
9131 bash-completion: Add all submodule subcommands to the completion list
9133 Michael J Gruber (4):
9134 allow installation of man and html doc from the man and html branches
9135 separate build targets for man and html documentation
9136 make prune report removed objects on -v
9137 test overlapping ignore patterns
9140 Docs: send-email's usage text and man page mention same options
9141 Docs: send-email usage text much sexier
9142 Docs: send-email: Man page option ordering
9143 send-email: change --no-validate to boolean --[no-]validate
9144 Docs: send-email: --chain_reply_to -> --[no-]chain-reply-to
9145 Docs: send-email: Remove unnecessary config variable description
9146 Docs: send-email: Create logical groupings for --help text
9147 Docs: send-email: Create logical groupings for man text
9148 send-email: signedoffcc -> signedoffbycc, but handle both
9150 Michele Ballabio (2):
9151 git gui: update Italian translation
9152 git gui: update Italian translation
9154 Mikael Magnusson (1):
9155 Correct output of git-count-objects.
9158 gitweb: Sort the list of forks on the summary page by age
9161 builtin-help: make some internal functions available to other builtins
9162 builtin-merge: allow using a custom strategy
9163 Add a new test for using a custom merge strategy
9164 Add a second testcase for handling invalid strategies in git-merge
9165 builtin-help: always load_command_list() in cmd_help()
9167 Split out merge_recursive() to merge-recursive.c
9168 merge-recursive: introduce merge_options
9169 builtin-merge: avoid run_command_v_opt() for recursive and subtree
9170 cherry-pick/revert: make direct internal call to merge_tree()
9171 merge-recursive: move call_depth to struct merge_options
9172 merge-recursive: get rid of the index_only global variable
9173 merge-recursive: move the global obuf to struct merge_options
9174 merge-recursive: move current_{file,directory}_set to struct merge_options
9175 merge-recursive: get rid of virtual_id
9176 builtin-merge: release the lockfile in try_merge_strategy()
9177 commit_tree(): add a new author parameter
9178 builtin-commit: use commit_tree()
9179 t7603: add new testcases to ensure builtin-commit uses reduce_heads()
9180 builtin-merge: refresh the index before calling a strategy
9181 builtin-commit: use reduce_heads() only when appropriate
9182 Cleanup in sha1_file.c::cache_or_unpack_entry()
9183 Implement git clone -v
9184 Add Linux PPC support to the pre-auto-gc example hook
9185 parse-opt: migrate builtin-checkout-index.
9186 Implement git remote rename
9187 remote: add a new 'origin' variable to the struct
9188 git-remote rename: migrate from remotes/ and branches/
9189 git-remote: document the migration feature of the rename subcommand
9190 Update Hungarian translation. 100% completed.
9191 builtin-branch: use strbuf in delete_branches()
9192 builtin-branch: use strbuf in fill_tracking_info()
9193 builtin-branch: use strbuf in rename_branch()
9194 builtin-clone: use strbuf in guess_dir_name()
9195 builtin-clone: use strbuf in clone_local() and copy_or_link_directory()
9196 builtin_clone: use strbuf in cmd_clone()
9197 git-stash: use git rev-parse -q
9198 filter-branch: use git rev-parse -q
9199 lost-found: use git rev-parse -q
9200 pull: use git rev-parse -q
9201 rebase: use git rev-parse -q
9202 submodule: use git rev-parse -q
9203 git-gui: Update Hungarian translation for 0.12
9204 git-daemon documentation: use {tilde}
9205 githooks documentation: add a note about the +x mode
9206 t9129: skip the last three tests if UTF-8 locale is not available
9208 Nanako Shiraishi (25):
9209 t/t91XX-svn: start removing use of "git-" from these tests
9210 t/t91XX git-svn tests: run "git svn" not "git-svn"
9211 t9200: use "git cvsexportcommit" without dash
9212 t9300, t9301: use "git fast-import/fast-export" without dash
9213 t9700: use "git config" without dash
9214 tests: use "git foo" without dash in strings
9215 t9101: use "git hash-object" without dash
9216 Install git-cvsserver in $(bindir)
9217 remote.c: make free_ref(), parse_push_refspec() and free_refspecs() static.
9218 graph.c: make many functions static
9219 usage.c: remove unused functions
9220 Add contrib/rerere-train script
9221 dir.c: make dir_add_name() and dir_add_ignored() static
9222 run-command.c: remove run_command_v_opt_cd()
9223 config.c: make git_parse_long() static
9224 commit.c: make read_graft_file() static
9225 archive.c: make archiver static
9227 rebase: Document --no-verify option to bypass pre-rebase hook
9228 Document "git log --source"
9229 Document "git log --simplify-by-decoration"
9230 git-gui: update Japanese translation
9231 git-gui: Update Japanese translation for 0.12
9232 Clarify documentation of "git checkout <tree-ish> paths" syntax
9233 Add a documentat on how to revert a faulty merge
9236 config.mak.in: Pass on LDFLAGS from configure
9238 Nguyễn Thái Ngọc Duy (1):
9239 Extend index to save more flags
9242 sha1write: don't copy full sized buffers
9243 pack-objects: don't include missing preferred base objects
9244 t5300: improve SHA1 collision test
9245 fix openssl headers conflicting with custom SHA1 implementations
9246 index-pack: rationalize delta resolution code
9247 index-pack: smarter memory usage during delta resolution
9248 fix multiple issues in index-pack
9249 improve index-pack tests
9250 index-pack: don't leak leaf delta result
9251 close another possibility for propagating pack corruption
9252 better validation on delta base object offsets
9253 make unpack_object_header() non fatal
9254 make packed_object_info() resilient to pack corruptions
9255 make check_object() resilient to pack corruptions
9256 make find_pack_revindex() aware of the nasty world
9257 pack-objects: allow "fixing" a corrupted pack without a full repack
9258 extend test coverage for latest pack corruption resilience improvements
9259 pack-objects: don't leak pack window reference when splitting packs
9262 provide more errors for the "merge into empty head" case
9264 Paul Mackerras (21):
9265 gitk: Use <Button-2> for context menus on OSX
9266 gitk: Clean up file encoding code and add enable/disable option
9267 gitk: Fix binding for <Return> in sha1 entry field
9268 gitk: New way of constructing menus that allows for Alt+letter accelerators
9269 gitk: Regenerate .po files
9270 gitk: Turn short SHA1 names into links too
9271 gitk: Fix some off-by-one errors in computing which line to blame
9272 gitk: Add a menu item to show where a given line comes from
9273 gitk: Make the background color of marked lines configurable
9274 gitk: Unify handling of merge diffs with normal 2-way diffs
9275 gitk: Make "show origin of this line" work on fake commits
9276 gitk: Cope with unmerged files in local changes
9277 gitk: Improve cherry-pick error handling
9278 gitk: Fix linehtag undefined error with file highlighting
9279 gitk: Index line[hnd]tag arrays by id rather than row number
9280 gitk: Fix switch statement in parseviewargs
9281 gitk: Show local changes properly when we have a path limit
9282 gitk: Fix context menu items for generating diffs when in tree mode
9283 gitk: Highlight only when search type is "containing:".
9284 gitk: Fix bug in accessing undefined "notflag" variable
9285 gitk: Fix bugs in blaming code
9288 git-svn: set auto_props when renaming files
9291 contrib/hooks/post-receive-email: Put rev display in separate function
9292 contrib/hooks/post-receive-email: Make revision display configurable
9295 Updated Swedish translation (514t0f0u).
9296 git-gui: Updated Swedish translation (515t0f0u).
9297 git-gui: Fixed typos in Swedish translation.
9299 Peter Valdemar Mørch (2):
9300 Teach git log --check to return an appropriate exit code
9301 Teach git log --exit-code to return an appropriate exit code
9304 git-web--browse: Support for using /bin/start on MinGW
9305 git-gui: Clarify the Remote -> Delete... action
9306 git-gui: Squash populate_{push,fetch}_menu to populate_remotes_menu
9307 git-gui: Add support for adding remotes
9308 git-gui: Add support for removing remotes
9309 git-gui: mkdir -p when initializing new remote repository
9310 git-gui: Use git web--browser for web browsing
9311 git-gui: Add Explore Working Copy to the Repository menu
9312 git-gui: gui.autoexplore makes explorer to pop up automatically after picking
9313 git-gui: Avoid using the term URL when specifying repositories
9314 git-gui: Make input boxes in init/clone/open dialogs consistent
9315 git-gui: Fix removing non-pushable remotes
9316 git-gui: Fix fetching from remotes when adding them
9317 gitweb: Clean-up sorting of project list
9318 gitweb: Quote non-displayable characters in hex, not octal
9319 config.c: Tolerate UTF8 BOM at the beginning of config file
9320 gitweb: Identify all summary metadata table rows
9321 gitweb: Add support for extending the action bar with custom links
9322 gitweb: Support for tag clouds
9323 gitweb: Make the by_tag filter delve in forks as well
9324 gitweb: Support for simple project search form
9325 Do not rename read-only files during a push
9327 Pierre Habouzit (8):
9328 Enable threaded delta search on *BSD and Linux.
9329 parse-opt: migrate fmt-merge-msg.
9330 parse-opt: migrate git-merge-base.
9331 parse-opt: migrate builtin-merge-file.
9332 git send-email: make the message file name more specific.
9333 git send-email: interpret unknown files as revision lists
9334 git send-email: add --annotate option
9335 git send-email: ask less questions when --compose is used.
9338 builtin-reflog: Allow reflog expire to name partial ref
9339 builtin-commit.c: show on which branch a commit was added
9340 git wrapper: also use aliases to correct mistyped commands
9343 Update RPM spec for the new location of git-cvsserver.
9345 Ralf Wildenhues (3):
9346 Correct typos in RelNotes-1.6.1
9347 Fix typos in the documentation.
9348 Improve language in git-merge.txt and related docs
9350 Raphael Zimmerer (1):
9351 git grep: Add "-z/--null" option as in GNU's grep.
9354 log: add load_ref_decorations()
9355 move load_ref_decorations() to log-tree.c and export it
9356 add '%d' pretty format specifier to show decoration
9357 add alloc_ref_with_prefix()
9358 use alloc_ref_from_str() everywhere
9359 make alloc_ref_from_str() the new alloc_ref()
9360 blame: inline get_patch()
9361 add xdi_diff_hunks() for callers that only need hunk lengths
9362 blame: use xdi_diff_hunks(), get rid of struct patch
9363 add strbuf_expand_dict_cb(), a helper for simple cases
9364 merge-recursive: use strbuf_expand() instead of interpolate()
9365 daemon: use strbuf_expand() instead of interpolate()
9366 daemon: inline fill_in_extra_table_entries()
9367 daemon: deglobalize variable 'directory'
9368 remove the unused files interpolate.c and interpolate.h
9369 Fix type-mismatch compiler warning from diff_populate_filespec()
9370 connect.c: stricter port validation, silence compiler warning
9371 fast-import.c: stricter strtoul check, silence compiler warning
9373 Richard Hartmann (2):
9374 Make help entries alphabetical
9375 Always show which directory is not a git repository
9378 gitk: Bind Key-Return to create on new branch dialog
9380 Robert Shearman (4):
9381 git-imap-send: Allow the program to be run from subdirectories of a git tree
9382 git-imap-send: Support SSL
9383 imap-send.c: style fixes
9384 Documentation: Improve documentation for git-imap-send(1)
9386 Robin Rosenberg (1):
9387 git-revert: record the parent against which a revert was made
9389 Romain Francoise (1):
9390 builtin-help: fallback to GIT_MAN_VIEWER before man
9393 bash: use for-each-ref format 'refname:short'
9394 remove vim syntax highlighting in favor of upstream
9395 bash: complete full refs
9398 Fix deletion of last character in levenshtein distance
9401 rev-list documentation: clarify the two parts of history simplification
9404 Add a built-in alias for 'stage' to the 'add' command
9406 Shawn O. Pearce (9):
9407 Make reflog query '@{1219188291}' act as '@{2008.8.19.16:24:51.-0700}'
9408 git-gui: Hide commit related UI during citool --nocommit
9409 git-gui: Use gitattribute "encoding" for file content display
9410 git-gui: Assume `blame --incremental` output is in UTF-8
9411 git-gui: Show/hide "Sign Off" based on nocommitmsg option
9412 describe: Make --tags and --all match lightweight tags more often
9413 Update the po template
9414 git-gui: Update po template to include 'Mirroring %s' message
9418 Make it possible to abort the submission of a change to Perforce
9421 Fix commit_tree() buffer leak
9422 merge-recursive.c: Add more generic merge_recursive_generic()
9424 Stephen Haberman (8):
9425 rebase--interactive: fix parent rewriting for dropped commits
9426 rebase-i-p: test to exclude commits from todo based on its parents
9427 rebase-i-p: use HEAD for updating the ref instead of mapping OLDHEAD
9428 rebase-i-p: delay saving current-commit to REWRITTEN if squashing
9429 rebase-i-p: fix 'no squashing merges' tripping up non-merges
9430 rebase-i-p: only list commits that require rewriting in todo
9431 rebase-i-p: do not include non-first-parent commits touching UPSTREAM
9432 rebase-i-p: if todo was reordered use HEAD as the rewritten parent
9434 Stephen R. van den Berg (4):
9435 git-daemon: call logerror() instead of error()
9436 git-daemon: use LOG_PID, simplify logging code
9437 git-daemon: Simplify dead-children reaping logic
9438 git-daemon: rewrite kindergarden, new option --max-connections
9441 bash completion: Add --[no-]validate to "git send-email"
9444 filter-branch: Extend test to show rewriting bug
9445 filter-branch: fix ref rewriting with --subdirectory-filter
9446 filter-branch: use --simplify-merges
9447 Documentation: rev-list-options: move --simplify-merges documentation
9448 rev-list: fix --reverse interaction with --parents
9449 t6013: replace use of 'tac' with equivalent Perl
9450 git svn: catch lack of upstream info for dcommit earlier
9451 git svn info: tests: let 'init' test run with SVN 1.5
9452 git svn info: tests: do not use set -e
9453 git svn info: tests: use test_cmp instead of git-diff
9454 git svn info: tests: fix ptouch argument order in setup
9455 git svn info: make info relative to the current directory
9456 git svn info: always quote URLs in 'info' output
9457 git-svn: match SVN 1.5 behaviour of info' on unknown item
9458 git-svn: fix 'info' tests for unknown items
9459 Documentation: new upstream rebase recovery section in git-rebase
9460 Documentation: Refer to git-rebase(1) to warn against rewriting
9461 Documentation: remove stale howto/rebase-and-edit.txt
9462 Documentation: add manpage about workflows
9464 Tom Preston-Werner (1):
9465 connect.c: add a way for git-daemon to pass an error back to client
9468 Install git-shell in bindir, too
9471 git-p4: Fix checkout bug when using --import-local.
9472 git-p4: Fix bug in p4Where method.
9473 git-p4: Fix regression in p4Where method.
9476 send-email: Fix Pine address book parsing
9479 Teach/Fix pull/fetch -q/-v options
9480 Retain multiple -q/-v occurrences in git pull
9482 YONETANI Tomokazu (1):
9483 git-fast-import possible memory corruption problem
9486 Version v1.6.0.6; changes since v1.6.0.5:
9487 -----------------------------------------
9490 git-mergetool: properly handle "git mergetool -- filename"
9493 git-svn: Make following parents atomic
9496 git-config.txt: fix a typo
9498 Johannes Schindelin (2):
9499 fast-import: close pack before unlinking it
9500 fast-export: deal with tag objects that do not have a tagger
9503 work around Python warnings from AsciiDoc
9504 git-show: do not segfault when showing a bad tag
9505 pager: do not dup2 stderr if it is already redirected
9506 gitweb: do not run "git diff" that is Porcelain
9508 fast-import: make tagger information optional
9511 fsck: reduce stack footprint
9513 Markus Heidelberg (1):
9514 Documentation: fix typos, grammar, asciidoc syntax
9517 SubmittingPatches: mention the usage of real name in Signed-off-by: lines
9520 make sure packs to be replaced are closed beforehand
9523 git-send-email: handle email address with quoted comma
9526 Version v1.6.0.5; changes since v1.6.0.4:
9527 -----------------------------------------
9529 Alexandre Julliard (2):
9530 checkout: Don't crash when switching away from an invalid branch.
9531 git-submodule: Avoid printing a spurious message.
9534 t7700: demonstrate mishandling of objects in packs with a .keep file
9535 packed_git: convert pack_local flag into a bitfield and add pack_keep
9536 pack-objects: new option --honor-pack-keep
9537 repack: don't repack local objects in packs with .keep file
9538 repack: do not fall back to incremental repacking with [-a|-A]
9539 builtin-gc.c: use new pack_keep bitfield to detect .keep file existence
9540 t7700: demonstrate mishandling of loose objects in an alternate ODB
9541 sha1_file.c: split has_loose_object() into local and non-local counterparts
9542 pack-objects: extend --local to mean ignore non-local loose objects too
9543 t7700: test that 'repack -a' packs alternate packed objects
9544 repack: only unpack-unreachable if we are deleting redundant packs
9545 revision.c: use proper data type in call to sizeof() within xrealloc
9548 Fix misleading wording for git-cherry-pick
9550 Christian Couder (3):
9551 Documentation: rev-list: change a few instances of "git-cmd" to "git cmd"
9552 Documentation: bisect: change a few instances of "git-cmd" to "git cmd"
9553 Documentation: fix links to "everyday.html"
9556 Fix non-literal format in printf-style calls
9559 xdiff: give up scanning similar lines early
9562 gitweb: Make project specific override for 'grep' feature work
9565 Documentation: git-svn: fix example for centralized SVN clone
9568 commit: Fix stripping of patch in verbose mode.
9569 tag: delete TAG_EDITMSG only on successful tag
9572 sha1_file: avoid bogus "file exists" error message
9574 Johannes Schindelin (1):
9575 fast-export: use an unsorted string list for extra_refs
9578 compat/mingw.c: Teach mingw_rename() to replace read-only files
9581 Makefile: help people who run 'make check' by mistake
9582 checkout: Fix "initial checkout" detection
9584 builtin-ls-files.c: coding style fix.
9585 Teach ls-files --with-tree=<tree> to work with options other than -c
9586 Teach "git diff" to honour --[no-]ext-diff
9587 Update draft release notes to 1.6.0.5
9591 date/time: do not get confused by fractional seconds
9594 git push: Interpret $GIT_DIR/branches in a Cogito compatible way
9597 Remove the period after the git-check-attr summary
9600 config.txt: alphabetize configuration sections
9601 git checkout: don't warn about unborn branch if -f is already passed
9602 "git diff <tree>{3,}": do not reverse order of arguments
9605 Add new testcase to show fast-export does not always exports all tags
9606 User's Manual: remove duplicated url at the end of Appendix B
9607 http.c: use 'git_config_string' to get 'curl_http_proxy'
9609 Nguyễn Thái Ngọc Duy (1):
9610 generate-cmdlist.sh: avoid selecting synopsis at wrong place
9613 Fix pack.packSizeLimit and --max-pack-size handling
9616 git-p4: fix keyword-expansion regex
9618 Ralf Wildenhues (1):
9619 Fix typos in the documentation.
9622 bash: remove dashed command leftovers
9623 bash: offer refs instead of filenames for 'git revert'
9626 sha1_file.c: resolve confusion EACCES vs EPERM
9629 tag: Check that options are only allowed in the appropriate mode
9630 tag: Add more tests about mixing incompatible modes and options
9633 git ls-remote: make usage string match manpage
9634 request-pull: make usage string match manpage
9637 fetch-pack: Avoid memcpy() with src==dst
9640 Version v1.6.0.4; changes since v1.6.0.3:
9641 -----------------------------------------
9644 Add mksnpath which allows you to specify the output buffer
9645 Fix mkpath abuse in dwim_ref and dwim_log of sha1_name.c
9646 Fix potentially dangerous uses of mkpath and git_path
9647 Plug a memleak in builtin-revert
9648 Add git_snpath: a .git path formatting routine with output buffer
9649 Fix potentially dangerous use of git_path in ref.c
9650 git_pathdup: returns xstrdup-ed copy of the formatted path
9651 Use git_pathdup instead of xstrdup(git_path(...))
9652 Add --verbose|-v to test-chmtime
9653 Use test-chmtime -v instead of perl in t5000 to get mtime of a file
9656 git-archive: work in bare repos
9658 Christian Jaeger (1):
9659 Git.pm: do not break inheritance
9661 Clemens Buchacher (2):
9662 do not force write of packed refs
9663 push: fix local refs update if already up-to-date
9666 git-svn: change dashed git-config to git config
9667 git-svn: change dashed git-commit-tree to git commit-tree
9670 git-gui: Help identify aspell version on Windows too
9673 Documentation/gitattributes: Add subsection header for each attribute
9676 Documentation: clarify information about 'ident' attribute
9679 refactor handling of "other" files in ls-files and status
9680 correct cache_entry allocation
9681 pack-objects: avoid reading uninitalized data
9682 fix overlapping memcpy in normalize_absolute_path
9683 send-pack: do not send out single-level refs such as refs/stash
9685 Johannes Schindelin (1):
9686 Fix fetch/pull when run without --update-head-ok
9689 asciidoc: add minor workaround to add an empty line after code blocks
9692 pull: allow "git pull origin $something:$current_branch" into an unborn branch
9693 Fix "checkout --track -b newbranch" on detached HEAD
9694 reset --hard/read-tree --reset -u: remove unmerged new paths
9695 demonstrate breakage of detached checkout with symbolic link HEAD
9696 Enhance hold_lock_file_for_{update,append}() API
9698 Update draft 1.6.0.4 release notes
9699 format-patch documentation: mention the special case of showing a single commit
9703 Add file delete/create info when we overflow rename_limit
9705 Markus Heidelberg (1):
9706 bash completion: add doubledash to "git show"
9708 Mikael Magnusson (1):
9709 Document that git-log takes --all-match.
9712 Fix git branch -m for symrefs.
9713 rename_ref(): handle the case when the reflog of a ref does not exist
9714 Fix git update-ref --no-deref -d.
9715 git branch -m: forbid renaming of a symref
9716 update-ref --no-deref -d: handle the case when the pointed ref is packed
9718 Nanako Shiraishi (1):
9719 Install git-cvsserver in $(bindir)
9721 Pierre Habouzit (1):
9722 git send-email: avoid leaking directory file descriptors.
9725 Update RPM spec for the new location of git-cvsserver.
9728 add -p: warn if only binary changes present
9730 Tom Preston-Werner (1):
9731 add instructions on how to send patches to the mailing list with Gmail
9734 Install git-shell in bindir, too
9737 Add reference for status letters in documentation.
9740 Version v1.6.0.3; changes since v1.6.0.2:
9741 -----------------------------------------
9743 Abhijit Bhopatkar (1):
9744 Documentation: Clarify '--signoff' for git-commit
9747 git-svn: factor out svnserve test code for later use
9748 git-svn: Always create a new RA when calling do_switch for svn://
9751 Remove empty directories in recursive merge
9752 Add remove_path: a function to remove as much as possible of a path
9753 Use remove_path from dir.c instead of own implementation
9755 Alexander Gavrilov (1):
9756 builtin-blame: Fix blame -C -C with submodules.
9758 Björn Steinbrink (1):
9759 force_object_loose: Fix memory leak
9762 t9700/test.pl: avoid bareword 'STDERR' in 3-argument open()
9763 t9700/test.pl: remove File::Temp requirement
9764 diff.c: return pattern entry pointer rather than just the hunk header pattern
9765 diff.c: associate a flag with each pattern and use it for compiling regex
9766 diff.*.xfuncname which uses "extended" regex's for hunk header selection
9767 t4018-diff-funcname: test syntax of builtin xfuncname patterns
9768 builtin-prune.c: prune temporary packs in <object_dir>/pack directory
9769 git-stash.sh: don't default to refs/stash if invalid ref supplied
9770 builtin-merge.c: allocate correct amount of memory
9771 git-stash.sh: fix flawed fix of invalid ref handling (commit da65e7c1)
9772 remote.c: correct the check for a leading '/' in a remote name
9773 t4018-diff-funcname: rework negated last expression test
9774 t4018-diff-funcname: demonstrate end of line funcname matching flaw
9775 xdiff-interface.c: strip newline (and cr) from line before pattern matching
9778 Add new test to demonstrate git archive core.autocrlf inconsistency
9779 Make git archive respect core.autocrlf when creating zip format archives
9782 Documentation: clarify the details of overriding LESS via core.pager
9785 contrib: update packinfo.pl to not use dashed commands
9787 Daniel Barkalow (1):
9788 Check early that a new branch is new and valid
9790 David Soria Parra (1):
9791 Solaris: Use OLD_ICONV to avoid compile warnings
9794 maint: check return of split_cmdline to avoid bad config strings
9795 git init: --bare/--shared overrides system/global config
9798 git-rebase-interactive: do not squash commits on abort
9799 git-rebase--interactive: auto amend only edited commit
9800 make prefix_path() never return NULL
9801 do not segfault if make_cache_entry failed
9804 completion: git commit should list --interactive
9807 git-svn: fix handling of even funkier branch names
9809 Fabrizio Chiarello (1):
9810 builtin-clone: fix typo
9813 Clarified gitattributes documentation regarding custom hunk header.
9815 Giuseppe Bilotta (1):
9816 gitweb: remove PATH_INFO from $my_url and $my_uri
9819 Start conforming code to "git subcmd" style part 3
9820 Cosmetical command name fix
9823 builtin-apply: fix typo leading to stack corruption
9826 gitweb: Fix two 'uninitialized value' warnings in git_tree()
9827 gitweb: Add path_info tests to t/t9500-gitweb-standalone-no-errors.sh
9830 Makefile: do not set NEEDS_LIBICONV for Solaris 8
9831 git apply --directory broken for new files
9832 tests: shell negation portability fix
9835 gitweb: avoid warnings for commits without body
9838 for-each-ref: Fix --format=%(subject) for log message without newlines
9839 Use strchrnul() instead of strchr() plus manual workaround
9841 Johannes Schindelin (2):
9842 git rm: refresh index before up-to-date check
9843 rebase -i: do not fail when there is no commit to cherry-pick
9846 git-remote: do not use user input in a printf format string
9847 git-push.txt: Describe --repo option in more detail
9850 checkout: Do not show local changes when in quiet mode
9851 git-check-attr(1): add output and example sections
9853 Junio C Hamano (15):
9854 discard_cache: reset lazy name_hash bit
9855 diff Porcelain: do not disable auto index refreshing on -C -C
9856 diff --quiet: make it synonym to --exit-code >/dev/null
9857 Don't verify host name in SSL certs when GIT_SSL_NO_VERIFY is set
9858 Fix permission bits on sources checked out with an overtight umask
9859 checkout: do not lose staged removal
9860 diff/diff-files: do not use --cc too aggressively
9861 Start draft release notes for 1.6.0.3
9862 diff: use extended regexp to find hunk headers
9863 diff hunk pattern: fix misconverted "\{" tex macro introducers
9864 Update draft release notes to 1.6.0.3
9865 diff(1): clarify what "T"ypechange status means
9866 Hopefully the final draft release notes update before 1.6.0.3
9867 Fix testcase failure when extended attributes are in use
9871 fix bogus "diff --git" header from "diff --no-index"
9874 git-svn: call 'fatal' correctly in set-tree
9877 t1301-shared-repo.sh: don't let a default ACL interfere with the test
9879 Michael J Gruber (1):
9880 make "git remote" report multiple URLs
9883 Replace svn.foo.org with svn.example.com in git-svn docs (RFC 2606)
9885 Mikael Magnusson (4):
9886 Typo "bogos" in format-patch error message.
9887 git-repack uses --no-repack-object, not --no-repack-delta.
9888 Fix a few typos in relnotes
9889 Typo "does not exists" when git remote update remote.
9892 test-lib: fix color reset in say_color()
9893 Add testcase to ensure merging an early part of a branch is done properly
9895 Nanako Shiraishi (2):
9896 docs: describe pre-rebase hook
9897 Teach rebase -i to honor pre-rebase hook
9900 fix pread()'s short read in index-pack
9901 rehabilitate 'git index-pack' inside the object store
9904 Do not perform cross-directory renames when creating packs
9907 git-submodule: Fix "Unable to checkout" for the initial 'update'
9909 Rafael Garcia-Suarez (1):
9910 Clarify commit error message for unmerged files
9913 t0024: add executable permission
9914 Documentation: remove '\' in front of short options
9915 rebase -i: proper prepare-commit-msg hook argument when squashing
9916 rebase -i: remove leftover debugging
9917 bash: remove fetch, push, pull dashed form leftovers
9920 Do not use errno when pread() returns 0
9922 Shawn O. Pearce (3):
9923 Update release notes for 1.6.0.3
9924 Update release notes for 1.6.0.3
9925 test-lib: fix broken printf
9927 Stephen Haberman (1):
9928 Clarify how the user can satisfy stash's 'dirty state' check.
9931 sha1_file: link() returns -1 on failure, not errno
9934 Use dashless git commands in setgitperms.perl
9937 Fix fetch/clone --quiet when stdout is connected
9940 Bust the ghost of long-defunct diffcore-pathspec.
9942 martin f. krafft (1):
9943 Improve git-log documentation wrt file filters
9946 Version v1.6.0.2; changes since v1.6.0.1:
9947 -----------------------------------------
9950 Fix use of hardlinks in "make install"
9952 Alexander Gavrilov (1):
9953 git-gui: Fix string escaping in po2msg.sh
9955 Alexandre Bourget (2):
9956 git-gui: Update french translation
9957 git-gui: update all remaining translations to French.
9960 Makefile: always provide a fallback when hardlinks fail
9962 Arjen Laarhoven (1):
9963 Use compatibility regex library for OSX/Darwin
9965 Ask Bjørn Hansen (1):
9966 Document sendemail.envelopesender configuration
9968 Björn Steinbrink (1):
9969 for-each-ref: Allow a trailing slash in the patterns
9971 Clemens Buchacher (2):
9972 git gui: show diffs with a minimum of 1 context line
9973 clone: fix creation of explicitly named target directory
9976 Document clarification: gitmodules, gitattributes
9979 Start conforming code to "git subcmd" style
9980 Improve documentation for --dirstat diff option
9981 Start conforming code to "git subcmd" style part 2
9984 Fix "git log -i --grep"
9985 pretty=format: respect date format options
9986 checkout: fix message when leaving detached HEAD
9987 Use compatibility regex library also on FreeBSD
9990 Bring local clone's origin URL in line with that of a remote clone
9993 Use compatibility regex library also on AIX
9996 Fix passwd(5) ref and reflect that commit doens't use commit-tree
9998 Junio C Hamano (17):
9999 ctype.c: protect tiny C preprocessor constants
10000 shell: do not play duplicated definition games to shrink the executable
10001 Fix example in git-name-rev documentation
10002 git-apply: Loosen "match_beginning" logic
10003 checkout: do not check out unmerged higher stages randomly
10004 gitattributes: -crlf is not binary
10005 diff: Help "less" hide ^M from the output
10006 'git foo' program identifies itself without dash in die() messages
10007 Start 1.6.0.2 maintenance cycle
10008 diff --cumulative is a sub-option of --dirstat
10009 log --author/--committer: really match only with name part
10010 "blame -c" should be compatible with "annotate"
10011 Mention the fact that 'git annotate' is only for backward compatibility.
10012 stash: refresh the index before deciding if the work tree is dirty
10013 Update draft release notes for 1.6.0.2
10014 Update draft release notes for 1.6.0.2
10017 Linus Torvalds (2):
10018 index-pack: be careful after fixing up the header/footer
10019 Fix '--dirstat' with cross-directory renaming
10022 Git.pm: Use File::Temp->tempfile instead of ->new
10023 git-svn: Fixes my() parameter list syntax error in pre-5.8 Perl
10026 Makefile: add merge_recursive.h to LIB_H
10027 t7501: always use test_cmp instead of diff
10029 Nanako Shiraishi (4):
10030 tests: use "git xyzzy" form (t0000 - t3599)
10031 tests: use "git xyzzy" form (t3600 - t6999)
10032 tests: use "git xyzzy" form (t7000 - t7199)
10033 tests: use "git xyzzy" form (t7200 - t9001)
10035 Nguyễn Thái Ngọc Duy (6):
10036 index-pack: setup git repository
10037 diff*: fix worktree setup
10038 grep: fix worktree setup
10039 read-tree: setup worktree if merge is required
10040 update-index: fix worktree setup
10041 setup_git_directory(): fix move to worktree toplevel directory
10044 discard revindex data when pack list changes
10045 pack-objects: improve returned information from write_one()
10046 improve reliability of fixup_pack_header_footer()
10047 pack-objects: use fixup_pack_header_footer()'s validation mode
10048 index-pack: use fixup_pack_header_footer()'s validation mode
10049 fixup_pack_header_footer(): use nicely aligned buffer sizes
10050 improve handling of sideband message display
10053 make git-shell paranoid about closed stdin/stdout/stderr
10055 Paolo Ciarrocchi (1):
10056 tutorial: gentler illustration of Alice/Bob workflow using gitk
10059 bash completion: Hide more plumbing commands
10061 Ralf Wildenhues (1):
10062 Fix some manual typos.
10064 Ramsay Allan Jones (2):
10065 Fix a warning (on cygwin) to allow -Werror
10066 Suppress some bash redirection error messages
10069 Documentation: fix reference to a for-each-ref option
10070 Documentation: fix disappeared lines in 'git stash' manpage
10071 Documentation: minor cleanup in a use case in 'git stash' manual
10073 Shawn O. Pearce (2):
10074 pack-objects: Allow missing base objects when creating thin packs
10075 git-gui: Fix diff parsing for lines starting with "--" or "++"
10078 config.txt: Add missing colons after option name
10081 Document gitk --argscmd flag.
10084 Version v1.6.0.1; changes since v1.6.0:
10085 ---------------------------------------
10087 Alexander Gavrilov (1):
10088 Respect core.autocrlf in combined diff
10091 t1002-read-tree-m-u-2way.sh: use 'git diff -U0' rather than 'diff -U0'
10092 revision.h: make show_early_output an extern which is defined in revision.c
10093 compat/snprintf.c: handle snprintf's that always return the # chars transmitted
10096 mailinfo: re-fix MIME multipart boundary parsing
10099 Completion: add missing '=' for 'diff --diff-filter'
10102 git-svn: fix dcommit to urls with embedded usernames
10105 mailinfo: avoid violating strbuf assertion
10106 decorate: allow const objects to be decorated
10109 git format-patch: avoid underrun when format.headers is empty or all NLs
10110 remote.c: remove useless if-before-free test
10113 Install templates with the user and group of the installing personality
10115 Jonathan Nieder (2):
10116 Documentation: clarify pager.<cmd> configuration
10117 Documentation: clarify pager configuration
10119 Junio C Hamano (9):
10120 Start 1.6.0.X maintenance series
10121 diff --check: do not get confused by new blank lines in the middle
10122 for-each-ref: cope with tags with incomplete lines
10123 completion: find out supported merge strategies correctly
10124 "git-merge": allow fast-forwarding in a stat-dirty tree
10125 Update draft release notes for 1.6.0.1
10126 unpack_trees(): protect the handcrafted in-core index from read_cache()
10127 merge: fix numerus bugs around "trivial merge" area
10131 Fix 'git help help'
10132 Makefile: enable SNPRINTF_RETURNS_BOGUS for HP-UX
10134 Robert Schiele (1):
10135 adapt git-cvsserver manpage to dash-free syntax
10137 Simon Hausmann (1):
10138 Clean up the git-p4 documentation
10140 Tarmigan Casebolt (1):
10141 Add hints to revert documentation about other ways to undo changes
10143 Tor Arvid Lund (1):
10144 git-p4: Fix one-liner in p4_write_pipe function.
10147 Version v1.6.0; changes since v1.6.0-rc3:
10148 -----------------------------------------
10151 Fix t3700 on filesystems which do not support question marks in names
10153 Alexander Gavrilov (1):
10154 gitk: Allow safely calling nukefile from a run queue handler
10157 Create a specific version of the read_pipe_lines command for p4 invocations
10158 Utilise the new 'p4_read_pipe_lines' command
10159 Have a command that specifically invokes 'p4' (via system)
10160 Utilise the new 'p4_system' function.
10161 Add a single command that will be used to construct the 'p4' command
10162 If we are in verbose mode, output what we are about to run (or return)
10163 Switch to using 'p4_build_cmd'
10164 If the user has configured various parameters, use them.
10165 Consistently use 'git-p4' for the configuration entries
10166 Move git-p4.syncFromOrigin into a configuration parameters section
10167 Put some documentation in about the parameters that have been added
10168 Put in the two other configuration elements found in the source
10169 Add p4 read_pipe and write_pipe wrappers
10170 Utilise our new p4_read_pipe and p4_write_pipe wrappers
10173 test-parse-options: use appropriate cast in length_callback
10174 t5304-prune: adjust file mtime based on system time rather than file mtime
10177 Makefile: building git in cygwin 1.7.0
10180 bash completion: 'git apply' should use 'fix' not 'strip'
10182 Junio C Hamano (1):
10186 Fix escaping of glob special characters in pathspecs
10189 bash completion: Add completion for 'git mergetool'
10190 bash completion: Add '--merge' long option for 'git log'
10193 bash-completion: Add non-command git help files to bash-completion
10194 Git.pm: Make File::Spec and File::Temp requirement lazy
10196 Matt McCutchen (1):
10197 git format-patch documentation: clarify what --cover-letter does
10200 Documentation: document the pager.* configuration setting
10201 t9300: replace '!' with test_must_fail
10204 git-p4: chdir now properly sets PWD environment variable in msysGit
10206 Shawn O. Pearce (1):
10210 git-am: ignore --binary option
10211 git-stash: improve synopsis in help and manual page
10212 Improve error output of git-rebase
10215 rebase -i -p: handle index and workdir correctly
10216 rebase -i -p: fix parent rewriting
10219 Version v1.6.0-rc3; changes since v1.6.0-rc2:
10220 ---------------------------------------------
10223 Makefile: set SHELL to value of SHELL_PATH
10224 Makefile: add a target which will abort compilation with ancient shells
10227 git-svn: add ability to specify --commit-url for dcommit
10228 git-svn: wrap long lines in a few places
10230 Francis Moreau (1):
10231 git-bisect: fix wrong usage of read(1)
10233 Gustaf Hendeby (2):
10234 gitattributes: Document built in hunk header patterns
10235 Teach git diff about BibTeX head hunk patterns
10237 Ivan Stankovic (1):
10238 Documentation: fix invalid reference to 'mybranch' in user manual
10240 Johannes Schindelin (1):
10241 clone --mirror: avoid storing repeated tags
10243 Jonathan Nieder (1):
10244 Documentation: user-manual: "git commit -a" doesn't motivate .gitignore
10246 Junio C Hamano (9):
10247 asciidoc markup fixes
10248 GIT-VERSION-GEN: mark the version 'dirty' only if there are modified files
10249 mailinfo: fix MIME multi-part message boundary handling
10250 Update draft RelNotes for 1.6.0
10251 Fix deleting reflog entries from HEAD reflog
10252 Re-fix rev-list-options documentation
10253 diff --check: do not unconditionally complain about trailing empty lines
10254 Do not talk about "diff" in rev-list documentation.
10258 Fix multi-glob assertion in git-svn
10259 git-svn: Allow deep branch names by supporting multi-globs
10260 Git.pm: Add faculties to allow temp files to be cached
10261 git-svn: Make it incrementally faster by minimizing temp files
10262 git-svn: Reduce temp file usage when dealing with non-links
10264 Nguyễn Thái Ngọc Duy (1):
10265 Fix typo in comments of longest_ancestor_length()
10268 Fail properly when cloning from invalid HTTP URL
10269 Adjust for the new way of enabling the default post-update hook
10272 builtin-rm: Add a --force flag
10273 reflog test: add more tests for 'reflog delete'
10276 bash: remove redundant check for 'git stash apply' options
10278 Stephen R. van den Berg (1):
10279 git-daemon: SysV needs the signal handler reinstated.
10282 Documentation: commit-tree: remove 16 parents restriction
10283 Documentation: filter-branch: document how to filter all refs
10284 filter-branch: be more helpful when an annotated tag changes
10285 Documentation: rev-list-options: Fix -g paragraph formatting
10286 Documentation: rev-list-options: Fix a typo
10287 Documentation: rev-list-options: Rewrite simplification descriptions for clarity
10290 Version v1.6.0-rc2; changes since v1.6.0-rc1:
10291 ---------------------------------------------
10293 Abhijit Menon-Sen (7):
10294 `git submodule add` now requires a <path>
10295 Make it clear that push can take multiple refspecs
10296 Make the DESCRIPTION match <x>... items in the SYNOPSIS
10297 Git.pm: localise $? in command_close_bidi_pipe()
10298 Fix hash slice syntax error
10299 Fix typo in perl/Git.pm
10300 Fix typos in INSTALL
10303 Make use of stat.ctime configurable
10305 Alexander Gavrilov (9):
10306 git-gui: Fix the Remote menu separator.
10307 git-gui: Preserve scroll position on reshow_diff.
10308 Support copy and rename detection in fast-export.
10309 gitk: Kill back-end processes on window close
10310 gitk: Arrange to kill diff-files & diff-index on quit
10311 gitk: On Windows, use a Cygwin-specific flag for kill
10312 gitk: Fixed broken exception handling in diff
10313 gitk: Fixed automatic row selection during load
10314 gitk: Fallback to selecting the head commit upon load
10316 Anders Melchiorsen (4):
10317 Advertise the ability to abort a commit
10318 Documentation: fix diff.external example
10319 Flush output in start_async
10320 Add output flushing before fork()
10322 Avery Pennarun (2):
10323 Teach "git diff -p" Pascal/Delphi funcname pattern
10324 git-svn: Abort with an error if 'fetch' parameter is invalid.
10327 t/t4202-log.sh: add newline at end of file
10328 Teach fsck and prune that tmp_obj_ file names may not be 14 bytes long
10329 perl/Makefile: handle paths with spaces in the NO_PERL_MAKEMAKER section
10331 Brian Gernhardt (1):
10332 Documentation: Remove mentions of git-svnimport.
10334 Cesar Eduardo Barros (1):
10335 Documentation/git-rev-parse.txt: update for new git-describe output format
10337 Christian Couder (2):
10338 merge-base: die with an error message if not passed a commit ref
10339 documentation: user-manual: update "using-bisect" section
10341 Christian Stimming (2):
10342 git-gui: Update German translation
10343 gitk: Updated German translation
10345 Ciaran McCreesh (1):
10346 Make git-add -i accept ranges like 7-
10348 David D. Kilzer (1):
10349 Fix race condition in t9119-git-svn-info.sh
10351 Dmitry Potapov (1):
10352 correct access right for git-svn-dcommit test
10355 git-svn: properly set path for "info" command
10356 t9119: conditionally re-enable test depending on svn(1) version
10358 Giuseppe Bilotta (2):
10359 diff: add ruby funcname pattern
10360 diff: chapter and part in funcname for tex
10363 init: handle empty "template" parameter
10364 Compact commit template message
10365 init: handle empty "template" parameter
10368 git-cvsimport.perl: Print "UNKNOWN LINE..." on stderr, not stdout.
10370 Johannes Schindelin (3):
10371 sort_in_topological_order(): avoid setting a commit flag
10372 clone: Add an option to set up a mirror
10373 clone --bare: Add ".git" suffix to the directory name to clone into
10376 git-gui: Adapt discovery of oguilib to execdir 'libexec/git-core'
10379 Fix reference to Everyday Git, which is an HTML document and not a man page.
10381 Jonathan Nieder (1):
10382 git-diff(1): "--c" -> "--cc" typo fix
10384 Junio C Hamano (19):
10385 Allow building without any git installed
10386 Allow installing in the traditional way
10387 ls-tree documentation: enhance notes on subdirectory and pathspec behaviour
10388 Documentation: clarify what is shown in "git-ls-files -s" output
10389 t7001: fix "git mv" test
10390 Teach gitlinks to ie_modified() and ce_modified_check_fs()
10391 Fix merge name generation in "merge in C"
10392 Fix test-parse-options "integer" test
10393 Teach --find-copies-harder to "git blame"
10394 make sure parsed wildcard refspec ends with slash
10395 Documentation: clarify diff --cc
10396 Update my e-mail address
10397 Start 1.5.6.5 RelNotes to describe accumulated fixes
10398 builtin-name-rev.c: split deeply nested part from the main function
10399 RelNotes 1.5.6.5 updates
10400 fix diff-tree --stdin documentation
10401 Files given on the command line are relative to $cwd
10406 format-patch: Produce better output with --inline or --attach
10409 bash completion: remove unused function _git_diff_tree
10410 bash completion: Add more long options for 'git log'
10411 bash completion: Add completion for 'git grep'
10412 bash completion: Add completion for 'git clone'
10413 bash completion: Add completion for 'git clean'
10414 bash completion: Add completion for 'git init'
10415 bash completion: Add completion for 'git revert'
10416 bash completion: More completions for 'git stash'
10417 bash completion: Add completion for 'git archive'
10418 bash completion: Add completion for 'git ls-files'
10419 bash completion: Add completion for 'git mv'
10421 Linus Torvalds (1):
10422 diff.renamelimit is a basic diff configuration
10424 Michele Ballabio (2):
10425 git-gui: update po/it.po
10426 git-gui: add a part about format strings in po/README
10428 Mikael Magnusson (2):
10429 git-gui: Update swedish translation.
10430 gitk: Update swedish translation.
10433 Documentation: typos / spelling fixes in older RelNotes
10434 Documentation: typos / spelling fixes
10436 Nanako Shiraishi (1):
10437 git-gui: update Japanese translation
10440 builtin-verify-tag: fix -v option parsing
10442 Pierre Habouzit (2):
10443 Allow "non-option" revision options in parse_option-enabled commands
10444 git-submodule: move ill placed shift.
10447 git-name-rev: allow --name-only in combination with --stdin
10450 archive: allow --exec and --remote without equal sign
10451 git-name-rev: don't use printf without format
10453 Shawn O. Pearce (2):
10454 git-gui: Fix gitk search in $PATH to work on Windows
10455 git-gui: Update git-gui.pot for 0.11 nearing release
10457 Steffen Prohaska (6):
10458 Refactor, adding prepare_git_cmd(const char **argv)
10459 run-command (Windows): Run dashless "git <cmd>"
10460 git-gui: Correct installation of library to be $prefix/share
10461 git-gui (Windows): Switch to relative discovery of oguilib
10462 git-gui (Windows): Change wrapper to execdir 'libexec/git-core'
10463 Modify mingw_main() workaround to avoid link errors
10466 builtin-revert.c: typofix
10469 Propagate -u/--upload-pack option of "git clone" to transport.
10472 Optimize sha1_object_info for loose objects, not concurrent repacks
10474 Todd Zullinger (1):
10475 Replace uses of "git-var" with "git var"
10478 Version v1.6.0-rc1; changes since v1.6.0-rc0:
10479 ---------------------------------------------
10481 Abhijit Menon-Sen (2):
10482 git-gui: Look for gitk in $PATH, not $LIBEXEC/git-core
10483 Clarify that "git log x.c y.h" lists commits that touch either file
10486 Allow pager of diff command be enabled/disabled
10488 Alexander Gavrilov (4):
10489 Fix pre-commit hooks under MinGW/MSYS
10490 Add options to control the search for copies in blame.
10491 Kill the blame back-end on window close.
10492 Add a menu item to invoke full copy detection in blame.
10494 Anders Melchiorsen (1):
10495 Documentation: fix diff.external example
10497 Björn Steinbrink (2):
10498 index-pack.c: correctly initialize appended objects
10499 rev-parse: Add support for the ^! and ^@ syntax
10502 git-svn: teach dcommit about svn auto-props
10505 t/: Replace diff [-u|-U0] with test_cmp to allow compilation with old diff
10506 t4116-apply-reverse.sh: use $TAR rather than tar
10507 t3200,t7201: replace '!' with test_must_fail
10508 t7502-commit.sh: rearrange test to make more portable
10509 t/t4202-log.sh: add newline at end of file
10510 Teach fsck and prune about the new location of temporary objects
10511 perl/Makefile: update NO_PERL_MAKEMAKER section
10513 Cesar Eduardo Barros (1):
10514 Documentation/git-submodule.txt: fix doubled word
10516 Daniel Barkalow (1):
10517 In perforce, RCS keywords are case-sensitive
10519 Jakub Narebski (1):
10520 gitweb: More about how gitweb gets 'owner' of repository
10522 Johannes Schindelin (9):
10523 Rename .git/rebase to .git/rebase-apply
10524 Rename path_list to string_list
10525 Fix two leftovers from path_list->string_list
10526 Ignore dirty submodule states in "git pull --rebase"
10527 Add test to show that show-branch misses out the 8th column
10528 sort_in_topological_order(): avoid setting a commit flag
10529 builtin-commit: Two trivial style-cleanups
10530 git daemon: avoid waking up too often
10531 Avoid chdir() in list_commands_in_dir()
10533 Johannes Sixt (12):
10534 rebase -i: When an 'edit' stops, mention the commit
10535 Makefile: Do not install a copy of 'git' in $(gitexecdir)
10536 Makefile: Normalize $(bindir) and $(gitexecdir) before comparing
10537 Record the command invocation path early
10538 Fix relative built-in paths to be relative to the command invocation
10539 Allow the built-in exec path to be relative to the command invocation path
10540 Allow add_path() to add non-existent directories to the path
10541 Windows: Make $(gitexecdir) relative
10542 Windows: Make sure argv[0] has a path
10543 Windows: Do not compile git-shell
10544 git-gui: Fix "Stage/Unstage Line" with one line of context.
10545 git-gui: "Stage Line": Treat independent changes in adjacent lines better
10547 Jonathan Nieder (3):
10548 git-diff(1): "--c" -> "--cc" typo fix
10549 document that git-tag can tag more than heads
10550 t6030 (bisect): work around Mac OS X "ls"
10552 Junio C Hamano (13):
10553 Update my e-mail address
10554 Revert "make git-status use a pager"
10555 tests: do not rely on external "patch"
10556 stash save: fix parameter handling
10557 builtin-branch.c: remove unused code in append_ref() callback function
10558 builtin-branch.c: optimize --merged and --no-merged
10559 Documentation: clarify diff --cc
10560 ignore non-existent refs in dwim_log()
10561 tests: propagate $(TAR) down from the toplevel Makefile
10562 Makefile: fix shell quoting
10563 Documentation: clarify how to disable elements in core.whitespace
10564 make sure parsed wildcard refspec ends with slash
10568 builtin-branch: remove duplicated code
10569 builtin-branch: factor out merge_filter matching
10570 builtin-branch: fix -v for --[no-]merged
10573 bash completion: Add long options for 'git rm'
10574 bash completion: Add completion for 'git help'
10577 builtin-merge: give a proper error message for invalid strategies in config
10578 t7601: extend the 'merge picks up the best result' test
10580 Nikolaj Schumacher (1):
10581 Don't cut off last character of commit descriptions.
10584 git-am: remove dash from help message
10585 parse-options: fix segmentation fault when a required value is missing
10586 git am --skip: clean the index while preserving local changes
10587 update test case to protect am --skip behaviour
10590 svnimport: newer libsvn wants us to ask for the root with "", not "/"
10592 Peter Valdemar Mørch (1):
10593 send-email: find body-encoding correctly
10596 git-filter-branch.sh: Allow running in bare repositories
10597 Documentation/git-filter-branch: teach "rm" instead of "update-index --remove"
10598 git-mv: Remove dead code branch
10599 git-mv: Keep moved index entries inact
10601 Philippe Bruhat (1):
10602 mailinfo: better parse email adresses containg parentheses
10604 Pierre Habouzit (4):
10605 builtin-merge: add missing structure initialization
10606 git-submodule: move ill placed shift.
10607 git-checkout: fix command line parsing.
10608 git-checkout: improve error messages, detect ambiguities.
10611 archive: add write_archive()
10612 archive: move parameter parsing code to archive.c
10613 archive: define MAX_ARGS where it's needed
10614 archive: declare struct archiver where it's needed
10615 archive: allow --exec and --remote without equal sign
10618 checkout: mention '--' in the docs
10619 bash: offer only paths after '--' for 'git checkout'
10621 Shawn O. Pearce (2):
10622 git-gui: Correct 'Visualize Branches' on Mac OS X to start gitk
10623 fsck: Don't require tmp_obj_ file names are 14 bytes in length
10626 git-am: Add colon before the subject that is printed out as being applied
10627 am --abort: Add to bash-completion and mention in git-rerere documentation
10628 Make non-static functions, that may be static, static
10629 Move launch_editor() from builtin-tag.c to editor.c
10630 editor.c: Libify launch_editor()
10631 git-am: Mention --abort in usage string part of OPTIONS_SPEC
10632 git-reset: Let -q hush "locally modified" messages
10635 Propagate -u/--upload-pack option of "git clone" to transport.
10636 Remove references to git-fetch-pack from "git clone" documentation.
10639 git-completion.bash: provide completion for 'show-branch'
10640 bash completion: Add long options for 'git describe'
10643 Version v1.6.0-rc0; changes since v1.5.6.5:
10644 -------------------------------------------
10646 Abhijit Menon-Sen (4):
10647 git-gui: Move on to the next filename after staging/unstaging a change
10648 git-gui: Don't select the wrong file if the last listed file is staged.
10649 Implement "git stash branch <newbranch> <stash>"
10650 Add a test for "git stash branch"
10653 Move read_revisions_from_stdin from builtin-rev-list.c to revision.c
10654 Teach git-bundle to read revision arguments from stdin like git-rev-list.
10657 Fix use of "perl -i" on Windows
10659 Alexander Gavrilov (4):
10660 Fix quadratic performance in rewrite_one.
10661 Avoid rescanning unchanged entries in search for copies.
10662 Do not try to detect move/copy for entries below threshold.
10663 Support gitlinks in fast-import.
10665 Avery Pennarun (1):
10666 Reword "your branch has diverged..." lines to reduce line length
10669 t7701-repack-unpack-unreachable.sh: check timestamp of unpacked objects
10671 Brian Gernhardt (4):
10672 Fix t4017-diff-retval for white-space from wc
10673 Add test results directory to t/.gitignore
10674 Documentation: Point to gitcli(7) from git(1)
10675 Documentation: mention ORIG_HEAD in am, merge, and rebase
10677 Christian Couder (2):
10678 help: check early if we have a command, if not try a documentation topic
10679 Fix "config_error_nonbool" used with value instead of key
10681 Ciaran McCreesh (1):
10682 Make git-add -i accept ranges like 7-
10684 Cristian Peraferrer (1):
10685 Print errno upon failure to open the COMMIT_EDITMSG file
10687 Daniel Barkalow (1):
10688 Only use GIT_CONFIG in "git config", not other programs
10691 Implement normalize_absolute_path
10692 Fold test-absolute-path into test-path-utils
10693 Add support for GIT_CEILING_DIRECTORIES
10694 Eliminate an unnecessary chdir("..")
10696 Dmitry Kakurin (1):
10697 Fixed text file auto-detection: treat EOF character 032 at the end of file as printable
10699 Dmitry Potapov (4):
10700 update-hook-example: optionally allow non-fast-forward
10701 shrink git-shell by avoiding redundant dependencies
10702 completion.bash: add 'skip' and 'run' to git-bisect
10703 git-svn: fix git svn info to work without arguments
10706 git-apply: handle a patch that touches the same path more than once better
10709 user-manual: typo and grammar fixes
10710 Documentation: fix broken "linkgit" links
10713 Documentation: tweak use case in "git stash save --keep-index"
10714 completion: add branch options --contains --merged --no-merged
10715 Teach lookup_prog not to select directories
10718 t/lib-git-svn: fix SVN_HTTPD tests to work with "trash directory"
10721 Testsuite: Unset CVS_SERVER
10722 testsuite for cvs co -c
10724 Frederik Schwarzer (1):
10728 tutorial: use prompt with user names in example, to clarify who is doing what
10730 Jakub Narebski (4):
10731 gitweb: Separate filling list of projects info
10732 gitweb: Separate generating 'sort by' table header
10733 t/README: Add 'Skipping Tests' section below 'Running Tests'
10734 gitweb: Describe projects_index format in more detail
10737 fix whitespace violations in test scripts
10738 mask necessary whitespace policy violations in test scripts
10739 avoid whitespace on empty line in automatic usage message
10740 avoid trailing whitespace in zero-change diffstat lines
10741 enable whitespace checking of test scripts
10742 clone: create intermediate directories of destination repo
10743 improve for-each-ref test script
10744 Allow per-command pager config
10745 avoid null SHA1 in oldest reflog
10748 Add 'git-p4.allowSubmit' to git-p4
10751 Incorporate fetched packs in future object traversal
10752 Move pack_refs() and friends into libgit
10753 Prepare testsuite for a "git clone" that packs refs
10754 Teach "git clone" to pack refs
10756 Johannes Schindelin (12):
10757 Windows: always chmod(, 0666) before unlink().
10758 commit-tree: lift completely arbitrary limit of 16 parents
10759 Allow git-apply to recount the lines in a hunk (AKA recountdiff)
10760 Add another fast-import example, this time for .zip files
10761 Teach "git apply" to prepend a prefix with "--root=<root>"
10762 git fetch-pack: do not complain about "no common commits" in an empty repo
10763 Allow cherry-picking root commits
10764 Convert CR/LF to LF in tag signatures
10765 Move MERGE_RR from .git/rr-cache/ into .git/
10766 git-gui: MERGE_RR lives in .git/ directly with newer Git versions
10767 shortlog: support --pretty=format: option
10768 Rename ".dotest/" to ".git/rebase" and ".dotest-merge" to "rebase-merge"
10770 Johannes Sixt (38):
10771 Add compat/regex.[ch] and compat/fnmatch.[ch].
10772 Compile some programs only conditionally.
10773 Add target architecture MinGW.
10774 Windows: Use the Windows style PATH separator ';'.
10775 setup.c: Prepare for Windows directory separators.
10776 Windows: Treat Windows style path names.
10777 Windows: Handle absolute paths in safe_create_leading_directories().
10778 Windows: Strip ".exe" from the program name.
10779 Windows: Implement a wrapper of the open() function.
10780 Windows: A minimal implemention of getpwuid().
10781 Windows: Work around misbehaved rename().
10782 Make my_mktime() public and rename it to tm_to_time_t()
10783 Windows: Implement gettimeofday().
10784 Windows: Fix PRIuMAX definition.
10785 Windows: Implement setitimer() and sigaction().
10786 Windows: Wrap execve so that shell scripts can be invoked.
10787 Windows: A pipe() replacement whose ends are not inherited to children.
10788 Windows: Implement start_command().
10789 Windows: A rudimentary poll() emulation.
10790 Windows: Disambiguate DOS style paths from SSH URLs.
10791 Windows: Implement asynchronous functions as threads.
10792 Windows: Work around incompatible sort and find.
10793 Windows: Implement wrappers for gethostbyname(), socket(), and connect().
10794 Windows: Implement a custom spawnve().
10795 Windows: Add a custom implementation for utime().
10796 Windows: Use a customized struct stat that also has the st_blocks member.
10797 Turn builtin_exec_path into a function.
10798 Windows: Compute the fallback for exec_path from the program invocation.
10799 Windows: Use a relative default template_dir and ETC_GITCONFIG
10800 When installing, be prepared that template_dir may be relative.
10801 Windows: Make the pager work.
10802 Windows: Work around an oddity when a pipe with no reader is written to.
10803 Windows: Make 'git help -a' work.
10804 Windows: TMP and TEMP environment variables specify a temporary directory.
10805 git-gui: Implement "Stage/Unstage Line"
10806 t4127-apply-same-fn: Avoid sed -i
10807 Provide fallback definitions of PRIu32 and PRIx32
10808 builtin-clone: rewrite guess_dir_name()
10810 Jonathan Nieder (23):
10811 Documentation: don't assume git-sh-setup and git-parse-remote are in PATH
10812 Documentation: fix links to tutorials and other new manual pages
10813 whitespace fix in Documentation/git-repack.txt
10814 Documentation: complicate example of "man git-command"
10815 git-daemon(1): don't assume git-daemon is in /usr/bin
10816 Documentation: prepare to be consistent about "git-" versus "git "
10817 Documentation: be consistent about "git-" versus "git "
10818 Documentation formatting and cleanup
10819 git-format-patch(1): fix stray \ in output
10820 Documentation: fix gitlinks
10821 manpages: fix bogus whitespace
10823 git-commit(1): depersonalize description
10824 Documentation: rewrap to prepare for "git-" vs "git " change
10825 Documentation: more "git-" versus "git " changes
10826 gitdiffcore(7): fix awkward wording
10827 manpages: italicize command names in synopses
10828 manpages: italicize command names
10829 manpages: italicize git command names (which were in teletype font)
10830 manpages: italicize gitk's name (where it was in teletype font)
10831 manpages: italicize nongit command names (if they are in teletype font)
10832 manpages: italicize git subcommand names (which were in teletype font)
10833 manpages: use teletype font for sample command lines
10836 git-svn: find-rev and rebase for SVN::Mirror repositories
10838 Junio C Hamano (67):
10839 revision traversal: --children option
10840 rev-list --children
10841 builtin-blame.c: move prepare_final() into a separate function.
10842 builtin-blame.c: allow more than 16 parents
10843 git-blame --reverse
10844 rerere: rerere_created_at() and has_resolution() abstraction
10845 git-rerere: detect unparsable conflicts
10846 rerere: remove dubious "tail_optimization"
10847 t4200: fix rerere test
10849 git-shell: accept "git foo" form
10850 Prepare execv_git_cmd() for removal of builtins from the filesystem
10851 pre-rebase hook update
10852 Ship sample hooks with .sample suffix
10853 Keep some git-* programs in $(bindir)
10854 Start draft release notes for 1.6.0
10855 diff --check: explain why we do not care whether old side is binary
10856 check_and_emit_line(): rename and refactor
10857 checkdiff: pass diff_options to the callback
10858 Teach "diff --check" about new blank lines at end
10859 diff --check: detect leftover conflict markers
10860 Update sample pre-commit hook to use "diff --check"
10861 Document the double-dash "rev -- path" disambiguator
10862 Per-ref reflog expiry configuration
10863 Make default expiration period of reflog used for stash infinite
10864 t9700: skip when Test::More is not available
10865 Update draft release notes for 1.6.0
10866 Introduce get_merge_bases_many()
10867 Introduce reduce_heads()
10868 Update draft release notes for 1.6.0
10869 apply --root: thinkofix.
10870 Refactor "tracking statistics" code used by "git checkout"
10871 git-status: show the remote tracking statistics
10872 git-branch -v: show the remote tracking statistics
10873 fast-export --export-marks: fix off by one error
10874 stat_tracking_info(): clear object flags used during counting
10875 branch -r -v: do not spit out garbage
10876 git-apply --directory: make --root more similar to GNU diff
10877 Update draft release notes for 1.6.0
10878 Teach "am" and "rebase" to mark the original position with ORIG_HEAD
10879 Tone down warning about GNU Interactive Tools
10880 Documentation: update sections on naming revisions and revision ranges
10881 branch --contains: default to HEAD
10882 branch --merged/--no-merged: allow specifying arbitrary commit
10883 apply: fix copy/rename breakage
10884 Teach merge.log to "git-merge" again
10885 Update draft release notes for 1.6.0
10886 reduce_heads(): protect from duplicate input
10887 git-rebase: report checkout failure
10888 tutorial: clarify "pull" is "fetch + merge"
10889 Update draft release notes to 1.6.0
10890 t/aggregate-results: whitespace fix
10891 Update draft release notes for 1.6.0
10892 read-cache.c: typofix
10893 mailinfo: off-by-one fix for [PATCH (foobar)] removal from Subject: line
10894 rerere.autoupdate: change the message when autoupdate is in effect
10895 builtin-remote.c: fix earlier "skip_prefix()" conversion
10896 t9001 (send-email): Do not use hardcoded /bin/sh in test
10898 Getting closer to 1.6.0-rc0
10899 builtin-add.c: restructure the code for maintainability
10900 git-add --all: add all files
10901 git-add --all: tests
10902 git-add --all: documentation
10903 Link shell with compat layer functions
10904 Move read_in_full() and write_in_full() to wrapper.c
10905 "needs update" considered harmful
10907 Karl Hasselström (2):
10908 Clean up builtin-update-ref's option parsing
10909 Make old sha1 optional with git update-ref -d
10912 git-send-email: Accept fifos as well as files
10914 Lars Noschinski (3):
10915 cvsserver: Add support for packed refs
10916 cvsserver: Add cvs co -c support
10917 cvsserver: Add testsuite for packed refs
10920 test-lib.sh: add --long-tests option
10921 t/test-lib.sh: add test_external and test_external_without_stderr
10922 Git.pm: add test suite
10923 gitweb: standarize HTTP status codes
10924 test-lib.sh: show git init output when in verbose mode
10925 GIT-VERSION-GEN: do not fail if a 'HEAD' file exists in the working copy
10927 Linus Torvalds (5):
10928 Split up default "core" config parsing into helper routine
10929 Split up default "user" config parsing into helper routine
10930 Split up default "i18n" and "branch" config parsing into helper routines
10931 Add config option to enable 'fsync()' of object files
10932 Shrink the git binary a bit by avoiding unnecessary inline functions
10934 Lukas Sandström (4):
10935 Add a helper script to send patches with Mozilla Thunderbird
10936 Make some strbuf_*() struct strbuf arguments const.
10937 Add some useful functions for strbuf manipulation.
10938 git-mailinfo: use strbuf's instead of fixed buffers
10940 Marius Storm-Olsen (4):
10941 Add an optional <mode> argument to commit/status -u|--untracked-files option
10942 Add argument 'no' commit/status option -u|--untracked-files
10943 Add configuration option for default untracked files mode
10944 Windows: Add a new lstat and fstat implementation based on Win32 API.
10947 install-doc-quick - use git --exec-path to find git-sh-setup
10948 git-submodule - make "submodule add" more strict, and document it
10949 git-submodule - register submodule URL if adding in place
10951 Michele Ballabio (3):
10952 t9301-fast-export.sh: Remove debug line
10953 builtin-merge.c: Fix option parsing
10954 builtin-push.c: Cleanup - use OPT_BIT() and remove some variables
10957 Catch failures from t5540-http-push
10959 Skip t5540-http-push test when USE_CURL_MULTI is undefined
10960 Avoid apache complaining about lack of server's FQDN
10963 We need to check for msys as well as Windows in add--interactive.
10966 A simple script to parse the results from the testcases
10967 Move split_cmdline() to alias.c
10968 Move commit_list_count() to commit.c
10969 Move parse-options's skip_prefix() to git-compat-util.h
10970 Add new test to ensure git-merge handles pull.twohead and pull.octopus
10971 Move read_cache_unmerged() to read-cache.c
10972 git-fmt-merge-msg: make it usable from other builtins
10973 Introduce get_octopus_merge_bases() in commit.c
10974 Add new test to ensure git-merge handles more than 25 refs.
10975 Add new test case to ensure git-merge reduces octopus parents when possible
10976 Retire 'stupid' merge strategy
10977 INSTALL: Update section about git-frotz form.
10978 hg-to-git: avoid raising a string exception
10979 hg-to-git: abort if the project directory is not a hg repo
10980 hg-to-git: rewrite "git-frotz" to "git frotz"
10981 hg-to-git: use git init instead of git init-db
10982 Add new test case to ensure git-merge prepends the custom merge message
10983 git-commit-tree: make it usable from other builtins
10984 Fix t7601-merge-pull-config.sh on AIX
10986 t0001-init.sh: change confusing directory name
10987 t1007-hash-object.sh: use quotes for the test description
10988 git-bisect: use dash-less form on git bisect log
10989 make remove-dashes: apply to scripts and programs as well, not just to builtins
10990 t6021: add a new test for git-merge-resolve
10991 Add a new test for git-merge-resolve
10992 Teach 'git merge' that some merge strategies no longer exist
10994 Nanako Shiraishi (7):
10995 environment.c: remove unused function
10996 config.c: make git_env_bool() static
10997 gitcli: Document meaning of --cached and --index
10998 cache-tree.c: make cache_tree_find() static
10999 builtin-describe.c: make a global variable "pattern" static
11000 parse-options.c: make check_typos() static
11003 Nguyễn Thái Ngọc Duy (1):
11004 Move all dashed-form commands to libexecdir
11006 Nicolas Pitre (11):
11007 call init_pack_revindex() lazily
11008 implement some resilience against pack corruptions
11009 test case for pack resilience against corruptions
11010 refactor pack structure allocation
11011 optimize verify-pack a bit
11012 move show_pack_info() where it belongs
11013 verify-pack: check packed object CRC when using index version 2
11014 verify-pack: test for detection of index v2 object CRC mismatch
11015 repack.usedeltabaseoffset config option now defaults to "true"
11016 pack.indexversion config option now defaults to 2
11017 restore legacy behavior for read_sha1_file()
11020 Documentation: remove {show,whatchanged}.difftree config options
11021 show_stats(): fix stats width calculation
11022 builtin-rerere: more carefully find conflict markers
11024 Patrick Higgins (1):
11025 Remove the use of '--' in merge program invocation
11028 t9600: allow testing with cvsps 2.2, including beta versions
11031 Add ANSI control code emulation for the Windows console
11034 Git.pm: Add remote_refs() git-ls-remote frontend
11035 Documentation/git-submodule.txt: Add Description section
11036 Documentation/RelNotes-1.6.0.txt: Expand on the incompatible packfiles
11037 Documentation/git-submodule.txt: Further clarify the description
11038 Documentation: How to ignore local changes in tracked files
11039 Documentation/git-merge.txt: Partial rewrite of How Merge Works
11041 Pierre Habouzit (13):
11042 parse-opt: have parse_options_{start,end}.
11043 parse-opt: Export a non NORETURN usage dumper.
11044 parse-opt: create parse_options_step.
11045 parse-opt: do not print errors on unknown options, return -2 intead.
11046 parse-opt: fake short strings for callers to believe in.
11047 parse-opt: add PARSE_OPT_KEEP_ARGV0 parser option.
11048 revisions: split handle_revision_opt() from setup_revisions()
11049 git-blame: migrate to incremental parse-option [1/2]
11050 git-blame: migrate to incremental parse-option [2/2]
11051 parse-options: add PARSE_OPT_LASTARG_DEFAULT flag
11052 git-blame: fix lapsus
11053 git-shortlog: migrate to parse-options partially.
11054 revisions: refactor handle_revision_opt into parse_revision_opt.
11057 builtin-fast-export: Add importing and exporting of revision marks
11059 Rafael Garcia-Suarez (1):
11060 gitweb: remove git_blame and rename git_blame2 to git_blame
11062 Ramsay Allan Jones (4):
11063 Fix some warnings (on cygwin) to allow -Werror
11064 t9113-*.sh: provide user feedback when test skipped
11065 t9100-git-svn-basic.sh: Fix determination of utf-8 locale
11066 git-request-pull: replace call to deprecated peek-remote
11069 Teach new attribute 'export-ignore' to git-archive
11070 archive: remove args member from struct archiver
11071 add context pointer to read_tree_recursive()
11072 archive: add baselen member to struct archiver_args
11073 archive: centralize archive entry writing
11074 archive: unify file attribute handling
11075 archive: remove extra arguments parsing code
11076 archive: make zip compression level independent from core git
11077 archive: remove unused headers
11080 git-gui: Fix accidental staged state toggle when clicking top pixel row
11082 Robert Shearman (1):
11083 git-send-email: Fix authenticating on some servers when using TLS.
11086 stash: introduce 'stash save --keep-index' option
11088 Shawn O. Pearce (2):
11089 Correct documentation for git-push --mirror
11090 bash completion: Remove dashed command completion support
11092 Soeren Finster (1):
11093 git-gui: Exit shortcut in MacOSX repaired
11095 Steffen Prohaska (5):
11096 Windows: Fix ntohl() related warnings about printf formatting
11097 compat/pread.c: Add a forward declaration to fix a warning
11098 Move code interpreting path relative to exec-dir to new function system_path()
11099 help.c: Add support for htmldir relative to git_exec_path()
11100 help (Windows): Display HTML in default browser using Windows' shell API
11102 Stephan Beyer (10):
11103 api-builtin.txt: update and fix typo
11104 t3404: stricter tests for git-rebase--interactive
11105 rerere: Separate libgit and builtin functions
11106 t/test-lib.sh: exit with small negagive int is ok with test_must_fail
11107 t/: Use "test_must_fail git" instead of "! git"
11108 Make usage strings dash-less
11109 git-am/git-mailsplit: correct synopsis for reading from stdin
11110 t3404: test two "preserve merges with -p" cases
11111 Make rebase--interactive use OPTIONS_SPEC
11112 Link git-shell only to a subset of libgit.a
11115 t/Makefile: use specified shell when running aggregation script
11117 Sverre Hvammen Johansen (1):
11118 reduce_heads(): thinkofix
11120 Sverre Rabbelier (2):
11121 Modify test-lib.sh to output stats to t/test-results/*
11122 Hook up the result aggregation in the test makefile.
11125 Don't use dash commands (git-foo) in tutorial-2
11128 bash: Add more option completions for 'git log'
11129 Add target "install-html" the the top level Makefile
11130 bash: Add long option completion for 'git send-email'
11133 git-send-email: add support for TLS via Net::SMTP::SSL
11134 git-send-email: prevent undefined variable warnings if no encryption is set
11135 git-add--interactive: replace hunk recounting with apply --recount
11136 git-add--interactive: remove hunk coalescing
11137 git-add--interactive: manual hunk editing mode
11138 git-send-email: Do not attempt to STARTTLS more than once
11139 Fix apply --recount handling of no-EOL line
11142 Version v1.5.6.5; changes since v1.5.6.4:
11143 -----------------------------------------
11145 Anders Melchiorsen (1):
11146 Documentation: fix diff.external example
11148 Björn Steinbrink (1):
11149 index-pack.c: correctly initialize appended objects
11152 t/t4202-log.sh: add newline at end of file
11154 Ciaran McCreesh (1):
11155 Make git-add -i accept ranges like 7-
11158 init: handle empty "template" parameter
11161 git-cvsimport.perl: Print "UNKNOWN LINE..." on stderr, not stdout.
11163 Johannes Schindelin (1):
11164 sort_in_topological_order(): avoid setting a commit flag
11166 Jonathan Nieder (2):
11167 fix usage string for git grep
11168 git-diff(1): "--c" -> "--cc" typo fix
11170 Junio C Hamano (12):
11171 refresh-index: fix bitmask assignment
11172 tests: propagate $(TAR) down from the toplevel Makefile
11173 Makefile: fix shell quoting
11174 make sure parsed wildcard refspec ends with slash
11175 Documentation: clarify diff --cc
11176 Update my e-mail address
11177 Start 1.5.6.5 RelNotes to describe accumulated fixes
11178 builtin-name-rev.c: split deeply nested part from the main function
11179 RelNotes 1.5.6.5 updates
11180 fix diff-tree --stdin documentation
11181 Files given on the command line are relative to $cwd
11184 Linus Torvalds (1):
11185 diff.renamelimit is a basic diff configuration
11188 Documentation: typos / spelling fixes in older RelNotes
11190 Peter Valdemar Mørch (1):
11191 send-email: find body-encoding correctly
11193 Pierre Habouzit (2):
11194 git-checkout: fix command line parsing.
11195 git-submodule: move ill placed shift.
11198 git-name-rev: allow --name-only in combination with --stdin
11201 git-name-rev: don't use printf without format
11204 builtin-revert.c: typofix
11207 Propagate -u/--upload-pack option of "git clone" to transport.
11210 Version v1.5.6.4; changes since v1.5.6.3:
11211 -----------------------------------------
11213 Dmitry Potapov (3):
11214 Fix buffer overflow in git-grep
11215 Fix buffer overflow in git diff
11216 Fix buffer overflow in prepare_attr_stack
11218 Johannes Schindelin (3):
11219 git daemon: avoid calling syslog() from a signal handler
11220 Add pretty format %aN which gives the author name, respecting .mailmap
11221 git fetch-pack: do not complain about "no common commits" in an empty repo
11224 t7600-merge: Use test_expect_failure to test option parsing
11226 Junio C Hamano (4):
11227 Start preparing 1.5.6.4 release notes
11228 rev-list: honor --quiet option
11229 http-fetch: do not SEGV after fetching a bad pack idx file
11232 Lars Noschinski (1):
11233 git-cvsserver: fix call to nonexistant cleanupWorkDir()
11235 Lukas Sandström (1):
11236 git-mailinfo: Fix getting the subject from the in-body [PATCH] line
11239 builtin-rm: fix index lock file path
11242 Documentation/git-cherry-pick.txt et al.: Fix misleading -n description
11244 Shawn O. Pearce (9):
11245 Correct pack memory leak causing git gc to try to exceed ulimit
11246 bash completion: Improve responsiveness of git-log completion
11247 bash completion: Don't offer "a.." as a completion for "a."
11248 bash completion: Append space after file names have been completed
11249 bash completion: Resolve git show ref:path<tab> losing ref: portion
11250 index-pack: Refactor base arguments of resolve_delta into a struct
11251 index-pack: Chain the struct base_data on the stack for traversal
11252 index-pack: Track the object_entry that creates each base_data
11253 index-pack: Honor core.deltaBaseCacheLimit when resolving deltas
11256 rebase-i: keep old parents when preserving merges
11257 api-run-command.txt: typofix
11260 Version v1.5.6.3; changes since v1.5.6.2:
11261 -----------------------------------------
11264 git-clone: remove leftover debugging fprintf().
11267 builtin-log.c: Use 'git_config_string' to get 'format.subjectprefix' and 'format.suffix'
11268 convert.c: Use 'git_config_string' to get 'smudge' and 'clean'
11269 diff.c: Use 'git_config_string' to get 'diff.external'
11270 http.c: Use 'git_config_string' to clean up SSL config.
11271 builtin-commit.c: Use 'git_config_string' to get 'commit.template'
11273 Christian Couder (1):
11274 Fix "config_error_nonbool" used with value instead of key
11277 git-svn.perl: workaround assertions in svn library 1.5.0
11280 make deleting a missing ref more quiet
11282 Johannes Schindelin (1):
11283 run_command(): respect GIT_TRACE
11285 Junio C Hamano (6):
11286 attribute documentation: keep EXAMPLE at end
11287 clone -q: honor "quiet" option over native transports.
11288 mailinfo: feed the correct line length to decode_transfer_encoding()
11289 Start preparing release notes for 1.5.6.3
11290 t0004: fix timing bug
11293 Linus Torvalds (1):
11294 racy-git: an empty blob has a fixed object name
11296 Lukas Sandström (1):
11297 git-mailinfo: document the -n option
11300 git-submodule - Fix bugs in adding an existing repo as a module
11302 Matthew Ogilvie (1):
11303 Documentation cvs: Clarify when a bare repository is needed
11305 Mikael Magnusson (1):
11306 Fix grammar in git-rev-parse(1).
11308 Nikolaus Schulz (1):
11309 Documentation: be precise about which date --pretty uses
11312 Fix backwards-incompatible handling of core.sharedRepository
11315 bash: offer only paths after '--'
11317 Shawn O. Pearce (1):
11318 Remove unnecessary pack-*.keep file after successful git-clone
11321 git-am: Do not exit silently if committer is unset
11324 Version v1.5.6.2; changes since v1.5.6.1:
11325 -----------------------------------------
11327 Avery Pennarun (1):
11328 git-svn: avoid filling up the disk with temp files.
11330 Björn Steinbrink (1):
11331 git cat-file: Fix memory leak in batch mode
11334 git-svn: don't sanitize remote names in config
11337 fetch: report local storage errors in status table
11338 doc/rev-parse: clarify reflog vs --until for specifying revisions
11339 fetch: give a hint to the user when local refs fail to update
11342 avoid off-by-one error in run_upload_archive
11345 fix git config example syntax
11347 Johannes Schindelin (2):
11348 clone: respect url.insteadOf setting in global configs
11349 clone: respect the settings in $HOME/.gitconfig and /etc/gitconfig
11351 Junio C Hamano (9):
11352 Allow "git-reset path" when unambiguous
11353 diff --check: do not discard error status upon seeing a good line
11354 git-shell: accept "git foo" form
11357 Start draft release notes for 1.5.6.2
11358 Work around gcc warnings from curl headers
11359 Fix executable bits in t/ scripts
11362 Shawn O. Pearce (1):
11363 Fix describe --tags --long so it does not segfault
11366 Fix 'git show' on signed tag of signed tag of commit
11369 Version v1.5.6.1; changes since v1.5.6:
11370 ---------------------------------------
11373 git-merge.sh: fix typo in usage message: sucesses --> succeeds
11374 t7502-commit.sh: test_must_fail doesn't work with inline environment variables
11377 completion: add --graph to log command completion
11379 Dmitry Potapov (1):
11380 fix update-hook-example to work with packed tag references
11383 Documentation: fix formatting in git-svn
11384 git-svn: make rebuild respect rewriteRoot option
11387 for-each-ref: implement missing tag values
11388 clone: create intermediate directories of destination repo
11390 Junio C Hamano (2):
11391 diff -c/--cc: do not include uninteresting deletion before leading context
11394 Linus Torvalds (1):
11395 Make git_dir a path relative to work_tree in setup_work_tree()
11397 Michele Ballabio (1):
11398 parse-options.c: fix documentation syntax of optional arguments
11400 Patrick Higgins (1):
11401 Workaround for AIX mkstemp()
11404 git-rebase.sh: Add check if rebase is in progress
11405 api-builtin.txt: update and fix typo
11406 api-parse-options.txt: Introduce documentation for parse options API
11407 Extend parse-options test suite
11410 Version v1.5.6; changes since v1.5.6-rc3:
11411 -----------------------------------------
11413 Alejandro Mery (1):
11414 git-am: head -1 is obsolete and doesn't work on some new systems
11416 Christian Couder (1):
11417 Documentation: RelNotes-1.5.6: talk about renamed HTML files
11420 clean up error conventions of remote.c:match_explicit
11423 cpio is no longer used by git-clone
11424 Consistency: Use "libcurl" instead of "cURL library" and "curl"
11425 The "curl" executable is no longer required
11427 Junio C Hamano (7):
11428 Makefile: update check-docs target
11429 Update RPM spec to drop curl executable requirement
11430 diff.c: fix emit_line() again not to add extra line
11431 create_tempfile: make sure that leading directories can be accessible by peers
11432 sha1_file.c: simplify parse_pack_index()
11433 builtin-rerere: fix a small leak
11437 gitweb: quote commands properly when calling the shell
11438 gitweb: remove unused parse_ref method
11440 Linus Torvalds (1):
11441 write_loose_object: don't bother trying to read an old object
11444 run-command documentation: fix "memset()" parameter
11445 path-list documentation: document all functions and data structures
11448 Fix approxidate("never") to always return 0
11450 Pierre Habouzit (1):
11451 Make git reflog expire honour core.sharedRepository.
11454 diff: reset color before printing newline
11457 Version v1.5.6-rc3; changes since v1.5.6-rc2:
11458 ---------------------------------------------
11460 Ask Bjørn Hansen (2):
11461 gitweb setup instruction: rewrite HEAD and root as well
11462 send-email: Allow the envelope sender to be set via configuration
11464 Avery Pennarun (2):
11465 git-svn: don't append extra newlines at the end of commit messages.
11466 git-svn: test that extra blank lines aren't inserted in commit messages.
11468 Boyd Lynn Gerber (2):
11469 progress.c: avoid use of dynamic-sized array
11470 Port to 12 other Platforms.
11473 Improve sed portability
11475 Christian Couder (1):
11476 documentation: bisect: remove bits talking about a bisection branch
11478 Flavio Poletti (1):
11479 git-instaweb: improve auto-discovery of httpd and call conventions.
11482 fix typo in tutorial
11484 Geoffrey Irving (1):
11485 doc: adding gitman.info and *.texi to .gitignore
11487 Jakub Narebski (2):
11488 gitweb: Make it work with $GIT containing spaces
11489 Use 'trash directory' thoroughly in t/test-lib.sh
11492 document --pretty=tformat: option
11494 Johannes Schindelin (1):
11495 merge-recursive: respect core.autocrlf when writing out the result
11498 make_nonrelative_path: Use is_absolute_path()
11499 Remove exec bit from builtin-fast-export.c
11501 Junio C Hamano (8):
11502 http-push.c: remove duplicated code
11503 "remote prune": be quiet when there is nothing to prune
11504 Documentation/git-pull.txt: Use more standard [NOTE] markup
11505 Documentation: exclude @pxref{[REMOTES]} from texinfo intermediate output
11506 user-manual: describe how higher stages are set during a merge
11507 t4126: fix test that happened to work due to timing
11508 sha1_file.c: dead code removal
11512 t1006-cat-file.sh: typo
11513 cat-file --batch / --batch-check: do not exit if hashes are missing
11514 Documentation/git-cat-file.txt: add missing line break
11515 t/.gitattributes: only ignore whitespace errors in test files
11517 Linus Torvalds (4):
11518 Consolidate SHA1 object file close
11519 Avoid cross-directory renames and linking on object creation
11520 Make loose object file reading more careful
11521 Simplify and rename find_sha1_file()
11523 Marius Storm-Olsen (1):
11524 Add testcase for merging in a CRLF repo
11527 git-submodule - Fix errors regarding resolve_relative_url
11529 Mikael Magnusson (1):
11533 Don't allocate too much memory in quote_ref_url
11536 Remove unused code in parse_commit_buffer()
11537 git-rebase -i: mention the short command aliases in the todo list
11538 git-read-tree: document -v option.
11541 remote show: fix the -n option
11542 builtin-remote: split show_or_prune() in two separate functions
11543 remote prune: print the list of pruned branches
11544 remote show: list tracked remote branches with -n
11546 Paul Mackerras (1):
11547 gitk: Handle detached heads better
11549 Philippe Bruhat (1):
11550 git-cvsimport: do not fail when CVSROOT is /
11553 git-send-email: allow whitespace in addressee list
11556 Ignore .gitattributes in bare repositories
11559 git add: add long equivalents of '-u' and '-f' options
11560 completion: add more 'git add' options
11562 Shawn O. Pearce (1):
11563 fast-export: Correctly generate initial commits with no parents
11566 git-commit.txt: Correct option alternatives
11567 git-commit.txt: Add missing long/short options
11568 Docs: Use "-l::\n--long\n" format in OPTIONS sections
11569 Docs: add some long/short options
11570 git-describe.txt: document --always
11571 git-name-rev.txt: document --no-undefined and --always
11574 Version v1.5.6-rc2; changes since v1.5.6-rc1:
11575 ---------------------------------------------
11578 graph API: fix "git log --graph --first-parent"
11579 git log --graph: print '*' for all commits, including merges
11582 Fix t5516 on cygwin: it does not like double slashes at the beginning of a path
11584 Björn Steinbrink (1):
11585 name-rev: Fix segmentation fault when using --all
11587 Christian Couder (2):
11588 documentation: convert "diffcore" and "repository-layout" to man pages
11589 documentation: move git(7) to git(1)
11591 Daniel Barkalow (1):
11592 Use nonrelative paths instead of absolute paths for cloned repositories
11594 Dirk Süsserott (1):
11595 Documentation/git-mailsplit: Enhanced description of -o option
11597 Jakub Narebski (1):
11598 gitweb: Add charset info to "raw" output of 'text/plain' blobs
11601 Fix "git clone http://$URL" to check out the worktree when asked
11603 Junio C Hamano (6):
11604 t7502: do not globally unset GIT_COMMITTER_* environment variables
11605 t7502: tighten loosely written test sequence
11606 Documentation: git-log cannot use rev-list specific options
11607 t7502: honor SHELL_PATH
11612 cat-file --batch: flush stdout also when objects are missing
11613 git-for-each-ref.txt: minor improvements
11615 Michael Dressel (1):
11616 describe: match pattern for lightweight tags too
11619 Strbuf documentation: document most functions
11622 Print info about "git help COMMAND" on git's main usage pages
11625 Version v1.5.6-rc1; changes since v1.5.6-rc0:
11626 ---------------------------------------------
11629 graph API: improve display of merge commits
11630 graph API: avoid printing unnecessary padding before some octopus merges
11632 Christian Couder (2):
11633 bisect: use "$GIT_DIR/BISECT_START" to check if we are bisecting
11634 Documentation: convert "glossary" and "core-tutorial" to man pages
11636 Christian Engwer (1):
11637 git-svn fails in prop_walk if $self->{path} is not empty
11639 Dmitry V. Levin (1):
11640 builtin-fetch.c (store_updated_refs): Honor update_local_ref() return value
11643 Documentation/git-bundle.txt: fix synopsis
11644 commit --interactive: properly update the index before commiting
11646 Jakub Narebski (2):
11647 gitweb: Remove gitweb/test/ directory
11648 gitweb: Fix "next" link on bottom of page
11651 git-reset: honor -q and do not show progress message
11654 clone: make sure we support the transport type
11656 Johannes Schindelin (1):
11657 hg-to-git: add --verbose option
11660 t5700-clone-reference: Quote $U
11661 Revert "filter-branch: subdirectory filter needs --full-history"
11662 rebase --interactive: Compute upstream SHA1 before switching branches
11664 John J. Franey (1):
11665 Clarify description of <repository> argument to pull/fetch for naming remotes.
11667 Junio C Hamano (25):
11668 tests: do not use implicit "git diff --no-index"
11669 diff-files: do not play --no-index games
11670 "git diff": do not ignore index without --no-index
11671 Update draft release notes for 1.5.6
11672 log --graph: do not accept log --graphbogus
11673 log --pretty: do not accept bogus "--prettyshort"
11674 Release Notes for 1.5.5.2
11675 Documentation/git.txt: link to 1.5.5.2 documentation.
11676 Makefile: fix dependency on wt-status.h
11677 show-branch --current: do not barf on detached HEAD
11678 git-diff: allow --no-index semantics a bit more
11679 git diff --no-index: default to page like other diff frontends
11681 t5100: Avoid filename "nul"
11682 Git::cat_blob: allow using an empty blob to fix git-svn breakage
11683 fix sha1_pack_index_name()
11684 Manual subsection to refer to other pages is SEE ALSO
11685 Documentation: git-cherry uses git-patch-id
11686 "git checkout -- paths..." should error out when paths cannot be written
11687 checkout: make reset_clean_to_new() not die by itself
11688 checkout: consolidate reset_{to_new,clean_to_new}()
11689 unpack_trees(): allow callers to differentiate worktree errors from merge errors
11690 checkout: "best effort" checkout
11691 commit: drop duplicated parents
11694 Karl Hasselström (3):
11695 Add some tests for git update-ref -d
11696 Fix path duplication in git svn commit-diff
11697 Revert "git.el: Set process-environment instead of invoking env"
11700 Documentation/git-filter-branch.txt: Fix description of --commit-filter
11703 gitweb: only display "next" links in logs if there is a next page
11704 t/test-lib.sh: resolve symlinks in working directory, for pathname comparisons
11705 Git.pm: fix documentation of hash_object
11706 glossary: improve a few links
11707 Git.pm: fix return value of config method
11709 Linus Torvalds (2):
11710 Make pack creation always fsync() the result
11711 Remove now unnecessary 'sync()' calls
11714 git-init: accept --bare option
11716 Marius Storm-Olsen (2):
11717 Clearify the documentation for core.ignoreStat
11718 Add shortcut in refresh_cache_ent() for marked entries.
11720 Michele Ballabio (1):
11721 Documentation: fix graph in git-rev-parse.txt
11724 Revision walking documentation: document most important functions
11727 make verify-pack a bit more useful with bad packs
11730 rollback lock files on more signals than just SIGINT
11733 builtin-fast-export: Only output a single parent per line
11736 Add a --dry-run option to git-svn rebase
11738 Shawn O. Pearce (8):
11739 git-gui: Add a --trace command line option
11740 git-gui: Handle workdir detection when CYGWIN=nowinsymlinks
11741 Don't diff empty tree on branch creation in paranoid update hook
11742 Don't load missing ACL files in paranoid update hook
11743 Ignore no-op changes in paranoid update hook
11744 Remove unused remote_prefix member in builtin-remote
11745 Make "git-remote prune" delete refs according to fetch specs
11746 Make "git-remote rm" delete refs acccording to fetch specs
11749 Add test cases for git-am
11750 Merge t4150-am-subdir.sh and t4151-am.sh into t4150-am.sh
11753 git-gui: Vertically align textboxes with labels
11756 Version v1.5.6-rc0; changes since v1.5.5.4:
11757 -------------------------------------------
11760 Add tests for git cat-file
11761 git-cat-file: Small refactor of cmd_cat_file
11762 git-cat-file: Make option parsing a little more flexible
11763 git-cat-file: Add --batch-check option
11764 git-cat-file: Add --batch option
11765 Move git-hash-object tests from t5303 to t1007
11766 Add more tests for git hash-object
11767 git-hash-object: Add --stdin-paths option
11768 Git.pm: Add command_bidi_pipe and command_close_bidi_pipe
11769 Git.pm: Add hash_and_insert_object and cat_blob
11770 git-svn: Speed up fetch
11772 Adam Simpkins (11):
11773 Remove dead code: show_log() sep argument and diff_options.msg_sep
11774 log: print log entry terminator even if the message is empty
11775 revision API: split parent rewriting and parent printing options
11776 Add history graph API
11777 log and rev-list: add --graph option
11778 graph API: eliminate unnecessary indentation
11779 graph API: fix graph mis-alignment after uninteresting commits
11780 graph API: don't print branch lines for uninteresting merge parents
11781 log --graph --left-right: show left/right information in place of '*'
11782 Fix output of "git log --graph --boundary"
11783 get_revision(): honor the topo_order flag for boundary commits
11786 Use the modern syntax of git-diff-files in t2002-checkout-cache-u.sh
11787 Improve reporting of errors in config file routines
11788 Make the exit code of add_file_to_index actually useful
11789 Extend interface of add_files_to_cache to allow ignore indexing errors
11790 Add --ignore-errors to git-add to allow it to skip files with read errors
11791 Add a test for git-add --ignore-errors
11792 Add a config option to ignore errors for git-add
11793 Ensure that a test is run in the trash directory
11794 Fix t6031 on filesystems without working exec bit
11795 Fix t3701 if core.filemode disabled
11797 Anders Waldenborg (1):
11798 gitweb: Convert string to internal form before chopping in chop_str
11800 Avery Pennarun (3):
11801 git-svn: add documentation for --use-log-author option.
11802 git-svn: Add --add-author-from option.
11803 git-svn: add documentation for --add-author-from option.
11805 Bart Trojanowski (1):
11806 make git-status use a pager
11809 filter-branch.sh: support nearly proper tag name filtering
11810 compat/fopen.c: avoid clobbering the system defined fopen macro
11811 repack: modify behavior of -A option to leave unreferenced objects unpacked
11812 git-gc: always use -A when manually repacking
11813 builtin-gc.c: deprecate --prune, it now really has no effect
11814 builtin-clone.c: Need to closedir() in copy_or_link_directory()
11815 t/Makefile: "trash" directory was renamed recently
11818 git-rebase.sh: Fix --merge --abort failures when path contains whitespace
11819 config.c: Escape backslashes in section names properly
11820 git-send-email.perl: Handle shell metacharacters in $EDITOR properly
11821 test-lib.sh: Add a test_set_editor function to safely set $VISUAL
11822 Use test_set_editor in t9001-send-email.sh
11823 test-lib.sh: Fix some missing path quoting
11824 lib-git-svn.sh: Fix quoting issues with paths containing shell metacharacters
11825 Don't use the 'export NAME=value' in the test scripts.
11826 Fix tests breaking when checkout path contains shell metacharacters
11827 Rename the test trash directory to contain spaces.
11829 Caio Marcelo de Oliveira Filho (1):
11830 git-format-patch: add --no-binary to omit binary changes in the patch.
11833 Documentation/git-prune.txt: document unpacked logic
11834 Documentation/git-repack.txt: document new -A behaviour
11837 Updated status to show 'Not currently on any branch' in red
11839 Christian Couder (21):
11840 bisect: add "git bisect help" subcommand to get a long usage string
11841 help: use man viewer path from "man.<tool>.path" config var
11842 documentation: help: add "man.<tool>.path" config variable
11843 help: use "man.<tool>.cmd" as custom man viewer command
11844 documentation: help: add info about "man.<tool>.cmd" config var
11845 documentation: web--browse: add a note about konqueror
11846 rev-parse: teach "--verify" to be quiet when using "-q" or "--quiet"
11847 rev-parse: fix --verify to error out when passed junk after a good rev
11848 Documentation: hooks: fix missing verb in pre-applypatch description
11849 Documentation: rename "hooks.txt" to "githooks.txt" and make it a man page
11850 Documentation: improve "add", "pull" and "format-patch" examples
11851 Documentation: bisect: add a few "git bisect run" examples
11852 rev-parse: add test script for "--verify"
11853 rev-parse: fix using "--default" with "--verify"
11854 rev-parse --verify: do not output anything on error
11855 Documentation: rev-parse: add a few "--verify" and "--default" examples
11856 bisect: add test cases to check that "git bisect start" is atomic
11857 bisect: fix left over "BISECT_START" file when starting with junk rev
11858 bisect: trap critical errors in "bisect_start"
11859 bisect: use a detached HEAD to bisect
11860 Documentation: convert tutorials to man pages
11862 Christian Stimming (3):
11863 git-gui: Update German translation
11864 gitk: Update German translation
11865 gitk: German translation again updated
11867 Clemens Buchacher (2):
11868 Reset the signal being handled
11869 http-push: remove remote locks on exit signals
11871 Clifford Caoile (1):
11872 git.el: Set process-environment instead of invoking env
11875 completion: allow 'git remote' subcommand completion
11876 completion: remove use of dashed git commands
11877 Allow cherry-pick (and revert) to add signoff line
11879 Daniel Barkalow (12):
11880 Make walker.fetch_ref() take a struct ref.
11881 Make ls-remote http://... list HEAD, like for git://...
11882 Mark the list of refs to fetch as const
11883 Add a lockfile function to append to a file
11884 Add a library function to add an alternate to the alternates file
11885 Have a constant extern refspec for "--tags"
11886 Allow for having for_each_ref() list extra refs
11887 Add a function to set a non-default work tree
11888 Provide API access to init_db()
11890 clone: fall back to copying if hardlinking fails
11891 Test that --reference actually suppresses fetching referenced objects
11893 Dmitry Potapov (1):
11894 git-init: autodetect core.ignorecase
11896 Dustin Sallings (2):
11897 Allow tracking branches to set up rebase by default.
11898 Allow tracking branches to set up rebase by default.
11901 git-svn: fix cloning of HTTP URLs with '+' in their path
11903 Frank Lichtenheld (4):
11904 var: Don't require to be in a git repository.
11905 Git.pm: Don't require a repository instance for config
11906 Git.pm: Don't require repository instance for ident
11907 send-email: Don't require to be called in a repository
11910 gitweb: fallback to system-wide config file if default config does not exist
11911 gitweb: fallback to system-wide config file (fixup)
11912 gitk: Makefile/install: force permissions when installing files and dirs
11914 Govind Salinas (1):
11915 pretty.c: add %x00 format specifier.
11917 Gustaf Hendeby (6):
11918 git-svn: Make create-ignore use git add -f
11919 Documentation: Add create-ignore to git svn manual
11920 Documentation/config.txt: Add git-gui options
11921 Documentation: Add missing git svn commands
11922 Documentation: Fix skipped section level
11923 Make git add -n and git -u -n output consistent
11926 Make core.sharedRepository more generic
11927 Document functions xmemdupz(), xread() and xwrite()
11928 Die for an early EOF in a file reading loop
11929 Make read_in_full() and write_in_full() consistent with xread() and xwrite()
11930 Cleanup xread() loops to use read_in_full()
11931 Add log.date config variable
11932 Remove redundant code, eliminate one static variable
11934 Imran M Yousuf (1):
11935 Use '-f' option to point to the .gitmodules file
11937 Jakub Narebski (1):
11938 gitweb: Use feed link according to current view
11941 add--interactive: ignore mode change in 'p'atch command
11942 add--interactive: allow user to choose mode update
11943 git-fetch: always show status of non-tracking-ref fetches
11944 git-remote: show all remotes with "git remote show"
11945 Documentation: point git-prune users to git-gc
11946 add merge.renamelimit config option
11947 bump rename limit defaults
11948 diff: make "too many files" rename warning optional
11949 fix bsd shell negation
11950 t5000: tar portability fix
11951 clone: bsd shell portability fix
11952 filter-branch: fix variable export logic
11955 Add a test for another combination of --reference
11956 Add test for cloning with "--reference" repo being a subset of source repo
11958 Johannes Schindelin (10):
11959 Provide git_config with a callback-data parameter
11960 builtin-clone: fix initial checkout
11961 cvsexportcommit: chomp only removes trailing whitespace
11962 diff options: Introduce --ignore-submodules
11963 Teach update-index about --ignore-submodules
11964 Ignore dirty submodule states during rebase and stash
11965 cvsexportcommit: introduce -W for shared working trees (between Git and CVS)
11966 submodule update: add convenience option --init
11967 pull --rebase: exit early when the working directory is dirty
11968 mailsplit and mailinfo: gracefully handle NUL characters
11971 builtin-commit.c: Remove a redundant assignment.
11972 git-gui: Report less precise object estimates for database compression
11973 compat-util: avoid macro redefinition warning
11976 Add otherwise missing --strict option to unpack-objects summary.
11978 Junio C Hamano (24):
11979 Optimize rename detection for a huge diff
11980 t5300: add test for "unpack-objects --strict"
11981 unpack-objects: fix --strict handling
11982 rebase [--onto O] A B: omit needless checkout
11983 sha1-lookup: more memory efficient search in sorted list of SHA-1
11984 diff: make --dirstat binary-file safe
11985 sha1-lookup: make selection of 'middle' less aggressive
11986 log: teach "terminator" vs "separator" mode to "--pretty=format"
11987 git_config_bool_or_int()
11988 write_index(): optimize ce_smudge_racily_clean_entry() calls with CE_UPTODATE
11989 diff-files: mark an index entry we know is up-to-date as such
11990 Fix git_config_bool_or_int
11991 First batch of post 1.5.5 updates
11992 diff: a submodule not checked out is not modified
11993 diff-lib.c: rename check_work_tree_entity()
11994 is_racy_timestamp(): do not check timestamp for gitlinks
11995 git-svn: add test for --add-author-from and --use-log-author
11996 builtin-apply: typofix
11997 builtin-apply: accept patch to an empty file
11998 builtin-apply: do not declare patch is creation when we do not know it
11999 unpack-trees: allow Porcelain to give different error messages
12000 "git-add -n -u" should not add but just report
12001 mailinfo: apply the same fix not to lose NULs in BASE64 and QP codepaths
12002 mailsplit: minor clean-up in read_line_with_nul()
12005 post-merge: Add it's not executed if merge failed.
12007 Krzysztof Kowalczyk (1):
12008 alloc_ref_from_str(): factor out a common pattern of alloc_ref from string
12011 Add platform-independent .git "symlink"
12012 Teach resolve_gitlink_ref() about the .git file
12013 Teach git-submodule.sh about the .git file
12014 Teach GIT-VERSION-GEN about the .git file
12015 git-branch: add support for --merged and --no-merged
12016 git-branch.txt: compare --contains, --merged and --no-merged
12017 Add tests for `branch --[no-]merged`
12018 revision.c: really honor --first-parent
12020 Linus Torvalds (12):
12021 Make unpack_trees_options bit flags actual bitfields
12022 Move name hashing functions into a file of its own
12023 Make "index_name_exists()" return the cache_entry it found
12024 Make hash_name_lookup able to do case-independent lookups
12025 Add 'core.ignorecase' option
12026 Make branch merging aware of underlying case-insensitive filsystems
12027 Make unpack-tree update removed files before any updated files
12028 When adding files to the index, add support for case-independent matches
12029 Make git-add behave more sensibly in a case-insensitive environment
12030 Optimize match_pathspec() to avoid fnmatch()
12031 Avoid some unnecessary lstat() calls
12032 Optimize symlink/directory detection
12035 Documentation on --git-dir and --work-tree
12037 Marcel Koeppen (2):
12038 Replace in-place sed in t7502-commit
12039 Fix prepare-commit-msg hook and replace in-place sed
12042 Be more careful with objects directory permissions on clone
12044 Martin Koegler (3):
12045 unpack-objects: prevent writing of inconsistent objects
12046 receive-pack: allow using --strict mode for unpacking objects
12047 t5300: add test for "index-pack --strict"
12049 Matthew Ogilvie (3):
12050 git-cvsserver: add mechanism for managing working tree and current directory
12051 implement gitcvs.usecrlfattr
12052 git-cvsserver: add ability to guess -kb from contents
12054 Matthias Kestenholz (1):
12055 Use color.ui variable in scripts too
12058 git-svn: detect and fail gracefully when dcommitting to a void
12060 Michele Ballabio (4):
12061 gitk: Disable "Reset %s branch to here" when on a detached head
12062 gitk: Move es.po where it belongs
12063 builtin-cat-file.c: use parse_options()
12064 change quoting in test t1006-cat-file.sh
12067 Makefile: update the default build options for AIX
12070 git-gc --auto: add pre-auto-gc hook
12071 Documentation/hooks: add pre-auto-gc hook
12072 contrib/hooks: add an example pre-auto-gc hook
12073 git checkout: add -t alias for --track
12074 git-format-patch: add a new format.cc configuration variable
12075 git-send-email: add a new sendemail.cc configuration variable
12076 Add tests for sendemail.cc configuration variable
12077 INSTALL: add a note about GNU interactive tools has been renamed
12078 git-fast-import: rename cmd_*() functions to parse_*()
12079 git-merge: exclude unnecessary options from OPTIONS_SPEC
12080 CodingGuidelines: Add a note to avoid assignments inside if()
12083 pack-objects: small cleanup
12084 pack-objects: remove some double negative logic
12085 pack-objects: simplify the condition associated with --all-progress
12086 pack-objects: clean up write_object() a bit
12087 pack-objects: move compression code in a separate function
12088 pack-objects: allow for early delta deflating
12089 pack-objects: fix early eviction for max depth delta objects
12090 add a force_object_loose() function
12091 let pack-objects do the writing of unreachable objects as loose objects
12094 Add a remote.*.mirror configuration option
12095 add special "matching refs" refspec
12097 Paul Mackerras (40):
12098 gitk: Use git log without --topo-order and reorganize the commits ourselves
12099 gitk: Fix bug in assigning row numbers to arcs
12100 gitk: Fix bug in parsing multiple revision arguments
12101 gitk: Compute row numbers and order tokens lazily
12102 gitk: Fix a couple of bugs
12103 gitk: Fix more bugs resulting in Tcl "no such element in array" errors
12104 gitk: More bug fixes and cleanups
12105 gitk: Implement date mode in the new framework
12106 gitk: Fix another collection of bugs
12107 gitk: Don't try to show local changes from a head that isn't shown
12108 gitk: Keep the same commits visible as other commits come in
12109 gitk: Fix some corner cases in the targetid/targetrow stuff
12110 gitk: Fix a couple of bugs in the find function
12111 gitk: Fix potential bug with fake commit IDs in renumbervarc
12112 gitk: Index [fnvr]highlights by id rather than row
12113 gitk: Fix handling of flag arguments
12114 gitk: Fix a bug in make_disporder
12115 gitk: Select head of current branch by default
12116 gitk: Select something appropriate on cherry-pick, branch reset and checkout
12117 gitk: Fix bug where editing an existing view would cause an infinite loop
12118 gitk: Fix bug causing Tcl error when no commits are selected
12119 gitk: Fix cherry-picking to insert a real row not a fake row
12120 gitk: Cope better with getting commits that we have already seen
12121 gitk: Fix bug where arcs could get lost
12122 gitk: Handle updating with path limiting better
12123 gitk: Fix problems with target row stuff
12124 gitk: Don't filter view arguments through git rev-parse
12125 gitk: Correct a few strings and comments to say "git log"
12126 gitk: Fix some corner cases in computing vrowmod and displayorder
12127 gitk: Avoid a crash in selectline if commitinfo($id) isn't set
12128 gitk: Fix problem with target row not being in scroll region
12129 gitk: Reorganize processing of arguments for git log
12130 gitk: Fix handling of tree file list with special chars in names
12131 gitk: Make updates go faster
12132 gitk: Synchronize highlighting in file view for 'f' and 'b' commands
12133 gitk: Show current row number and total number of rows
12134 gitk: Add a progress bar for checking out a head
12135 gitk: Fix "wrong # coordinates" error on reload
12136 gitk: Fix bug where current row number display stops working
12137 gitk: Fix bug introduced by "gitk: Fix "wrong # coordinates" error on reload"
12140 Make git-cvsimport remove ['s from tags, as bad_ref_char doesn't allow them.
12142 Peter Karlsson (1):
12143 gitk: Initial Swedish translation.
12146 git-submodule summary: --for-status option
12147 builtin-status: submodule summary support
12148 builtin-status: Add tests for submodule summary
12149 t4027: test diff for submodule with empty directory
12150 Add t7506 to test submodule related functions for git-status
12152 Rafael Garcia-Suarez (1):
12153 Spelling fixes in the gitweb documentation
12156 bash: Add completion for gitk --merge
12157 Documentation gitk: Describe what --merge does
12160 doc: moved merge.* config variables into separate merge-config.txt
12161 merge, pull: introduce '--(no-)stat' option
12162 add 'merge.stat' config variable
12163 fmt-merge-msg: add '--(no-)log' options and 'merge.log' config variable
12164 merge, pull: add '--(no-)log' command line option
12167 Preparation to call determine_author_info from prepare_to_commit
12168 commit: Show author if different from committer
12169 commit: Show committer if automatic
12172 gitk: Spanish translation of gitk
12174 Sebastian Schuberth (1):
12175 mergetool: Make ECMerge use the settings as specified by the user in the GUI
12177 Shawn O. Pearce (3):
12178 git-gui: Don't use '$$cr master' with aspell earlier than 0.60
12179 git-gui: Setup branch.remote,merge for shorthand git-pull
12180 git-gui: Delete branches with 'git branch -D' to clear config
12182 Steffen Prohaska (4):
12183 t0050: Test autodetect core.ignorecase
12184 t0050: Set core.ignorecase case to activate case insensitivity
12185 t0050: Add test for case insensitive add
12186 t0050: Fix merge test on case sensitive file systems
12189 builtin-apply.c: use git_config_string() to get apply_default_whitespace
12191 Stephen R. van den Berg (2):
12192 Simplify and fix --first-parent implementation
12193 git-svn: Same default as cvsimport when using --use-log-author
12196 Add svn-compatible "blame" output format to git-svn
12199 Documentation/git-web--browse.txt: fix small typo
12202 gitk: Allow users to view diffs in external diff viewer
12205 cvsexportcommit: Create config option for CVS dir
12208 Version v1.5.5.4; changes since v1.5.5.3:
12209 -----------------------------------------
12211 Björn Steinbrink (1):
12212 name-rev: Fix segmentation fault when using --all
12214 Junio C Hamano (1):
12218 git-for-each-ref.txt: minor improvements
12220 Michael Dressel (1):
12221 describe: match pattern for lightweight tags too
12224 Version v1.5.5.3; changes since v1.5.5.2:
12225 -----------------------------------------
12227 Christian Couder (1):
12228 bisect: print an error message when "git rev-list --bisect-vars" fails
12231 git-bisect.sh: don't accidentally override existing branch "bisect"
12232 Documentation/git-bundle.txt: fix synopsis
12233 commit --interactive: properly update the index before commiting
12235 Horst H. von Brand (1):
12236 Fix recipient santitization
12239 send-email: specify content-type of --compose body
12240 send-email: rfc2047-quote subject lines with non-ascii characters
12243 Revert "filter-branch: subdirectory filter needs --full-history"
12245 Junio C Hamano (3):
12246 Release Notes for 1.5.5.2
12247 show-branch --current: do not barf on detached HEAD
12251 gitweb: only display "next" links in logs if there is a next page
12253 Michele Ballabio (1):
12254 Documentation: fix graph in git-rev-parse.txt
12257 builtin-fast-export: Only output a single parent per line
12260 Version v1.5.5.2; changes since v1.5.5.1:
12261 -----------------------------------------
12263 A Large Angry SCM (1):
12264 git-repack: re-enable parsing of -n command line option
12267 Use "=" instead of "==" in condition as it is more portable
12268 Fix use after free() in builtin-fetch
12271 post-receive-email: fix accidental removal of a trailing space in signature line
12274 copy.c: copy_fd - correctly report write errors
12275 archive.c: format_subst - fixed bogus argument to memchr
12278 git-clone.txt: Adjust note to --shared for new pruning behavior of git-gc
12281 Remove 'header' from --signoff option description
12283 Dmitry Potapov (1):
12284 git-gc --prune is deprecated
12286 Dustin Sallings (1):
12287 Documentation/config.txt: Mention branch.<name>.rebase applies to "git pull"
12289 Florian Ragwitz (1):
12290 filter-branch: Documentation fix.
12293 diff-options.txt: document the new "--dirstat" option
12296 Add missing "short" alternative to --date in rev-list-options.txt
12299 Documentation/git-describe.txt: make description more readable
12302 Don't force imap.host to be set when imap.tunnel is set
12303 t5516: remove ambiguity test (1)
12304 doc/git-gc: add a note about what is collected
12305 push: allow unqualified dest refspecs to DWIM
12306 remote: create fetch config lines with '+'
12307 fix reflog approxidate parsing bug
12308 cvsimport: always pass user data to "system" as a list
12309 checkout: don't rfc2047-encode oneline on detached HEAD
12310 doc: clarify definition of "update" for git-add -u
12311 doc/git-daemon: s/uploadarchive/uploadarch/
12312 git-am: fix typo in usage message
12315 wt-status.h: declare global variables as extern
12316 rev-parse --symbolic-full-name: don't print '^' if SHA1 is not a ref
12319 git-filter-branch: Clarify file removal example.
12320 git-show.txt: Not very stubby these days.
12322 Junio C Hamano (3):
12323 write-tree: properly detect failure to write tree objects
12324 clone: detect and fail on excess parameters
12325 fetch-pack: brown paper bag fix
12327 Linus Torvalds (1):
12328 fetch-pack: do not stop traversing an already parsed commit
12331 Linked glossary from cvs-migration page
12333 Matthew Ogilvie (1):
12334 gitattributes: Fix subdirectory attributes specified from root directory
12337 svn-git: Use binmode for reading/writing binary rev maps
12340 diff options documentation: refer to --diff-filter in --name-status
12343 Amend git-push refspec documentation
12345 Shawn O. Pearce (1):
12346 Clarify repack -n documentation
12348 Sitaram Chamarty (1):
12349 builtin-commit.c: add -u as short name for --untracked-files
12352 bash: Add completion for git diff --base --ours --theirs
12354 Thomas Guyot-Sionnest (1):
12355 git-svn bug with blank commits and author file
12357 martin f. krafft (2):
12358 Escape project name in regexp
12359 Escape project names before creating pathinfo URLs
12362 Version v1.5.5.1; changes since v1.5.5:
12363 ---------------------------------------
12365 Alberto Bertogli (1):
12366 builtin-apply: Show a more descriptive error on failure when opening a patch
12368 Björn Steinbrink (1):
12369 Fix section about backdating tags in the git-tag docs
12372 Fix documentation syntax of optional arguments in short options.
12373 core-tutorial.txt: Fix showing the current behaviour.
12375 Christian Couder (4):
12376 bisect: fix bad rev checking in "git bisect good"
12377 bisect: report bad rev better
12378 bisect: squelch "fatal: ref HEAD not a symref" misleading message
12379 git-bisect: make "start", "good" and "skip" succeed or fail atomically
12381 Clifford Caoile (1):
12382 Docs gitk: Explicitly mention the files that gitk uses (~/.gitk)
12384 Daniel Barkalow (1):
12385 Fix config key miscount in url.*.insteadOf
12387 Dirk Süsserott (1):
12388 Documentation/git-request-pull: Fixed a typo ("send" -> "end")
12390 Jakub Narebski (1):
12391 gitweb: Fix 'history' view for deleted files with history
12394 git-fetch: fix status output when not storing tracking ref
12397 Document option --only of git commit
12400 Clarify and fix English in "git-rm" documentation
12403 git-remote: reject adding remotes with invalid names
12405 Junio C Hamano (7):
12406 Document -w option to shortlog
12407 Documentation/git-submodule: typofix
12408 t7401: squelch garbage output
12409 rebase: do not munge commit log message
12410 git-am: minor cleanup
12411 am: POSIX portability fix
12414 Linus Torvalds (2):
12415 Ignore leading empty lines while summarizing merges
12416 git-am: cope better with an empty Subject: line
12419 git-submodule - possibly use branch name to describe a module
12422 Document that WebDAV doesn't need git on the server, and works over SSL
12424 Michele Ballabio (1):
12425 revision.c: make --date-order overriddable
12428 Force the medium pretty format on calls to git log
12431 git-submodule: Avoid 'fatal: cannot describe' message
12434 git-archive: ignore prefix when checking file attribute
12437 Clarify documentation of git-cvsserver, particularly in relation to git-shell
12440 git clean: Don't automatically remove directories when run within subdirectory
12441 git clean: Add test to verify directories aren't removed with a prefix
12444 Version v1.5.5; changes since v1.5.5-rc3:
12445 -----------------------------------------
12447 Christian Couder (2):
12448 git-gui: Update french translation
12449 test suite: remove useless TERM cruft in "t7005-editor.sh"
12452 git-svn: fix following renamed paths when tracking a single path
12455 gitk: Fix changing colors through Edit->Preferences
12457 Jakub Narebski (1):
12458 Revert "gitweb: Add 'status_str' to parse_difftree_raw_line output"
12460 Junio C Hamano (2):
12461 Fix "git apply" to correctly enforce "match at the beginning"
12465 git-fetch: Don't trigger a bus error when given the refspec "tag"
12467 Michele Ballabio (1):
12468 git-gui: use +/- instead of ]/[ to show more/less context in diff
12471 Add interactive option in rebase command completion list.
12472 Add prefix oriented completions for diff and format-patch commands.
12475 git-pack-objects.txt: Make wording slightly less ambiguous
12476 Add description of OFS_DELTA to the pack format description
12478 Shawn O. Pearce (1):
12479 git-gui: Switch keybindings for [ and ] to bracketleft and bracketright
12482 Version v1.5.5-rc3; changes since v1.5.5-rc2:
12483 ---------------------------------------------
12486 mktag.c: improve verification of tagger field and tests
12487 mktag.c: tweak validation of tagger field and adjust test script
12490 Silence cpio's "N blocks" output when cloning locally
12492 Christian Couder (1):
12493 help: Add a missing OPT_END().
12495 Damien Diederen (7):
12496 cvsserver: Respond to the 'editors' and 'watchers' commands
12497 cvsserver: Only print the file part of the filename in status header
12498 cvsserver: Do not include status output for subdirectories if -l is passed
12499 cvsserver: Add a few tests for 'status' command
12500 cvsserver: Implement update -p (print to stdout)
12501 cvsserver: Add test for update -p
12502 cvsserver: Use the user part of the email in log and annotate results
12505 git-svn: remove redundant slashes from show-ignore
12508 filter-branch: Test renaming directories in a tree-filter
12509 verify-tag: Clean up the temporary file if gpg cannot be started.
12510 t7004-tag: Skip more tests if gpg is not available.
12512 Jonathan del Strother (1):
12513 git-gui: Add shortcut keys for Show More/Less Context
12516 Allow git-cvsserver database table name prefix to be specified.
12518 Junio C Hamano (5):
12519 Add corner case tests for diff-index and diff-files
12520 diff-index: careful when inspecting work tree items
12521 diff-files: careful when inspecting work tree items
12522 Accept git aliases outside a git repository
12525 Marius Storm-Olsen (1):
12526 git-p4: Handle Windows EOLs properly after removal of p4 submit template handling.
12529 git-cvsserver: handle change type T
12531 Shawn O. Pearce (1):
12535 Describe the bug in handling filenames with funny characters in 'git add -i'
12537 veillette@yahoo.ca (1):
12538 filter-branch: Fix renaming a directory in the tree-filter
12541 Version v1.5.5-rc2; changes since v1.5.5-rc1:
12542 ---------------------------------------------
12545 t/t3800-mktag.sh: use test_must_fail rather than '!'
12547 Daniel Barkalow (2):
12548 Tighten refspec processing
12549 Fix branches file configuration
12551 Dirk Süsserott (1):
12552 Documentation: git-tag '-m'/'-F' implies '-a'
12554 Frank Lichtenheld (1):
12555 t9600-cvsimport.sh: set HOME before checking for cvsps availability
12558 imap-send: properly error out if imap.host is not set in config
12561 Fix the wrong output of `git-show v1.3.0~155^2~4` in documentation.
12562 Fix the wrong output of `git-show v1.3.0~155^2~4` in documentation.
12565 Documentation: clarify use of .git{ignore,attributes} versus .git/info/*
12567 Johannes Schindelin (2):
12568 RelNotes: mention checkout/branch's --track option, too
12569 init: show "Reinit" message even in an (existing) empty repository
12572 builtin-remote: Fix missing newline at end of listing of pushed branches
12574 Julian Phillips (1):
12575 Documentation/git-checkout: Update summary to reflect current abilities
12577 Junio C Hamano (7):
12578 refspec: allow colon-less wildcard "refs/category/*"
12579 git-fetch test: test tracking fetch results, not just FETCH_HEAD
12580 test_must_fail: 129 is a valid error code from usage()
12581 Update draft release notes for 1.5.4.5
12582 Update draft release notes for 1.5.5
12583 builtin-prune: protect objects listed on the command line
12586 Michele Ballabio (3):
12587 parse-options.c: introduce OPT_DATE
12588 Add tests for git-prune
12589 builtin-prune.c: use parse_options()
12592 Always set *nongit_ok in setup_git_directory_gently()
12595 Version v1.5.5-rc1; changes since v1.5.5-rc0:
12596 ---------------------------------------------
12599 builtin-gc.c: allow disabling all auto-gc'ing by assigning 0 to gc.auto
12600 t/t7003-filter-branch.sh: use test_must_fail rather than '!'
12602 Daniel Barkalow (3):
12603 Tighten refspec processing
12607 Eyvind Bernhardsen (2):
12608 fast-import: Allow "reset" to delete a new branch without error
12609 fast-import: Document the effect of "merge" with no "from" in a commit
12611 Johannes Schindelin (1):
12612 remote show: do not show symbolic refs
12614 Junio C Hamano (10):
12615 Makefile: DIFF_OBJS is not special at all these days
12616 Makefile: flatten enumeration of headers, objects and programs
12617 t1000: use "test_must_fail git frotz", not "! git frotz"
12618 git-merge-one-file: fix longstanding stupid thinko
12619 Test: catch if trash cannot be removed
12620 Add tests to catch problems with un-unlinkable symlinks
12621 Fix read-tree not to discard errors
12622 remote.c: Fix overtight refspec validation
12623 gc --auto: raise default auto pack limit from 20 to 50
12627 Add --reverse to the git-rev-list usage string
12628 Document the sendemail.smtpserverport config variable
12629 Don't try and percent-escape existing percent escapes in git-svn URIs
12630 Make git-svn tests behave better on OS X
12632 Linus Torvalds (3):
12633 Don't update unchanged merge entries
12634 Fix possible Solaris problem in 'checkout_entry()'
12635 Make revision limiting more robust against occasional bad commit dates
12637 Marius Storm-Olsen (1):
12638 git-p4: Optimize the fetching of data from perforce.
12641 Documentation/git-merge: document subtree strategy.
12644 make it easier for people who just want to get rid of 'git gc --auto'
12646 Ralf Wildenhues (1):
12647 Improve description of git filter-branch.
12650 git-p4: Unset P4DIFF environment variable when using 'p4 -du diff'
12651 git-p4: Use P4EDITOR environment variable when set
12654 Version v1.5.5-rc0; changes since v1.5.4.5:
12655 -------------------------------------------
12657 Adam Piątyszek (1):
12658 git-gui: Add option for changing the width of the commit message text box
12661 Fix builtin checkout crashing when given an invalid path
12662 Fix test for cleanup failure in t7300 on Windows
12663 Do not use GUID on dir in git init --shared=all on FreeBSD
12664 git-gui: update russian translation
12666 Alexandre Julliard (5):
12667 git.el: Support for showing unknown/ignored directories.
12668 git.el: Added a command to amend a commit.
12669 git.el: Check for existing buffers on revert.
12670 git.el: Better handling of subprocess errors.
12671 git.el: Do not display empty directories.
12673 Andreas Ericsson (1):
12674 pack-objects: Add runtime detection of online CPU's
12676 Brandon Casey (13):
12677 builtin-reflog.c: fix typo that accesses an unset variable
12678 Add compat/fopen.c which returns NULL on attempt to open directory
12679 builtin-reflog.c: don't install new reflog on write failure
12680 reflog-delete: parse standard reflog options
12681 git-reflog: add option --rewrite to update reflog entries while expiring
12682 refs.c: make close_ref() and commit_ref() non-static
12683 git-reflog: add option --updateref to write the last reflog sha1 into the ref
12684 git-stash: add new 'drop' subcommand
12685 git-stash: add new 'pop' subcommand
12686 pack-objects: Print a message describing the number of threads for packing
12687 t3903-stash.sh: Add missing '&&' to body of testcase
12688 git-reflog.txt: Document new commands --updateref and --rewrite
12689 t3903-stash.sh: Add tests for new stash commands drop and pop
12692 compat: Add simplified merge sort implementation from glibc
12695 gitweb: Make use of the $git_dir variable at sub git_get_project_url_list
12696 gitweb: Use the config file to set repository owner's name.
12699 Eliminate confusing "won't bisect on seeked tree" failure
12702 Make builtin-reset.c use parse_options.
12704 Charles Bailey (6):
12705 Tidy up git mergetool's backup file behaviour
12706 Changed an internal variable of mergetool to support custom commands
12707 Teach git mergetool to use custom commands defined at config time
12708 Add a very basic test script for git mergetool
12709 git-mergetool documentaiton: show toolnames in typewriter font
12710 merge-tool documentation: describe custom command usage
12712 Christian Couder (17):
12713 help: make 'git-help--browse' usable outside 'git-help'.
12714 help--browse: add '--config' option to check a config option for a browser.
12715 Rename 'git-help--browse.sh' to 'git-web--browse.sh'.
12716 instaweb: use 'git-web--browse' to launch browser.
12717 config: add test cases for empty value and no value config variables.
12718 Documentation: instaweb: add 'git-web--browse' information.
12719 web--browse: Add a few quotes in 'init_browser_path'.
12720 Documentation: add 'git-web--browse.txt' and simplify other docs.
12721 help.c: use 'git_config_string' to get 'help_default_format'.
12722 run-command: Redirect stderr to a pipe before redirecting stdout to stderr
12723 help: add "man.viewer" config var to use "woman" or "konqueror"
12724 Documentation: help: describe 'man.viewer' config variable
12725 help: implement multi-valued "man.viewer" config option
12726 Documentation: help: explain 'man.viewer' multiple values
12727 help: warn if specified 'man.viewer' is unsupported, instead of erroring out
12728 web--browse: use custom commands defined at config time
12729 Documention: web--browse: add info about "browser.<tool>.cmd" config var
12731 Christian Stimming (4):
12732 git-gui: (i18n) Fix a bunch of still untranslated strings.
12733 git-gui: Update German translation.
12734 git-gui: (i18n) Add newly added translation strings to template.
12735 git-gui: Update German translation.
12737 Clemens Buchacher (2):
12738 http-push: push <remote> :<branch> deletes remote branch
12739 http-push: add regression tests
12741 Daniel Barkalow (33):
12742 Test :/string form for checkout
12743 Reduce the number of connects when fetching
12744 Allow callers of unpack_trees() to handle failure
12745 Add flag to make unpack_trees() not print errors.
12746 Send unpack-trees debugging output to stderr
12747 Discard "deleted" cache entries after using them to update the working tree
12748 Add "skip_unmerged" option to unpack_trees.
12749 Build-in merge-recursive
12750 Move create_branch into a library file
12751 Use diff -u instead of diff in t7201
12752 Library function to check for unmerged index entries
12753 Move code to clean up after a branch change to branch.c
12755 Clean up reporting differences on branch switch
12756 API documentation for remote.h
12757 Add more tests for format-patch
12758 Improve message-id generation flow control for format-patch
12759 Export some email and pretty-printing functions
12760 Use ALLOC_GROW in remote.{c,h}
12761 Add a --cover-letter option to format-patch
12762 Add tests for extra headers in format-patch
12763 Fix format.headers not ending with a newline
12764 Combine To: and Cc: headers
12765 Support a --cc=<email> option in format-patch
12766 Resolve value supplied for no-colon push refspecs
12767 builtin-checkout.c: Remove unused prefix arguments in switch_branches path
12768 Add support for url aliases in config files
12769 Add API access to shortlog
12770 Improve collection of information for format-patch --cover-letter
12771 Always use the current connection's remote ref list in git protocol
12772 Use diff_tree() directly in making cover letter
12773 Write index file on any checkout of files
12774 Write diff output to a file in struct diff_options
12777 gitk: Don't show local changes when we there is no work tree
12780 git-send-email: Generalize auto-cc recipient mechanism.
12783 git.el: Set process-environment instead of invoking env
12786 cleanup: remove unused git_checkout_config
12787 whatchanged documentation: share description of --pretty with others
12788 specify explicit "--pretty=medium" with `git log/show/whatchanged`
12789 log/show/whatchanged: introduce format.pretty configuration
12791 Dmitry Potapov (3):
12792 git-web--browse: do not start the browser with nohup
12793 Make private quote_path() in wt-status.c available as quote_path_relative()
12794 git-clean: correct printing relative path
12797 git-svn: improve repository URL matching when following parents
12799 Florian La Roche (1):
12800 gitweb: Make feed entries point to commitdiff view
12802 Frank Lichtenheld (1):
12803 gc: Add --quiet option
12806 gitk: properly deal with tag names containing / (slash)
12807 git-merge-index documentation: clarify synopsis
12808 builtin-tag.c: remove cruft
12809 hash-object: cleanup handling of command line options
12811 Jakub Narebski (11):
12812 gitweb: Fix displaying unchopped argument in chop_and_escape_str
12813 gitweb: Add new option -nohtml to quot_xxx subroutines
12814 gitweb: Fix bug in href(..., -replay=>1) when using 'pathinfo' form
12815 gitweb: Fix bugs in git_search_grep_body: it's length(), not len()
12816 gitweb: Better cutting matched string and its context
12817 Add '--fixed-strings' option to "git log --grep" and friends
12818 gitweb: Change parse_commits signature to allow for multiple options
12819 gitweb: Simplify fixed string search
12820 Documentation: Remove --{min,max}-age option from git-log(1)
12821 gitweb: Mark first match when searching commit messages
12822 gitweb: Fix and simplify pickaxe search
12825 Add a BuildRequires for gettext in the spec file.
12827 Jason McMullan (1):
12828 Remove $Id: ..$ $Header: ..$ etc from +ko and +k files during import
12831 git-web--browse: fix misplaced quote in init_browser_path()
12832 git-help--browse: improve browser support under OS X
12833 builtin-checkout.c: fix possible usage segfault
12834 branch: optionally setup branch.*.merge from upstream local branches
12835 doc: documentation update for the branch track changes
12836 Correct git-pull documentation
12837 send-email: fix In-Reply-To regression
12838 pull: pass --strategy along to to rebase
12840 Jean-Luc Herren (1):
12841 fast-import: exit with proper message if not a git dir
12844 allow suppressing of global and system config
12845 fix config reading in tests
12846 hard-code the empty tree object
12847 add--interactive: handle initial commit better
12848 git_config_*: don't assume we are parsing a config file
12849 t3404: use configured shell instead of /bin/sh
12850 diff: fix java funcname pattern for solaris
12851 t9001: enhance fake sendmail test harness
12852 send-email: test compose functionality
12854 make alias lookup a public, procedural function
12855 help: respect aliases
12856 use build-time SHELL_PATH in test scripts
12857 rename: warn user when we have turned off rename detection
12858 allow git-am to run in a subdirectory
12859 Add a test for read-tree -u --reset with a D/F conflict
12860 gitk: make autoselect optional
12861 tr portability fixes
12862 t0050: perl portability fix
12863 more tr portability test script fixes
12864 grep portability fix: don't use "-e" or "-q"
12865 remove use of "tail -n 1" and "tail -1"
12866 add test_cmp function for test scripts
12867 t4020: don't use grep -a
12868 t6000lib: tr portability fix
12869 add NO_EXTERNAL_GREP build option
12870 filter-branch: don't use xargs -0
12871 filter-branch: use $SHELL_PATH instead of 'sh'
12872 t9112: add missing #!/bin/sh header
12873 t7505: use SHELL_PATH in hook
12874 t6000lib: re-fix tr portability
12877 Avoid unnecessary "if-before-free" tests.
12880 Add testcase for 'git cvsexportcommit -w $cvsdir ...' with relative $GIT_DIR
12881 Fix 'git cvsexportcommit -w $cvsdir ...' when used with relative $GIT_DIR
12883 Johannes Schindelin (21):
12884 Teach "git reflog" a subcommand to delete single entries
12885 Also use unpack_trees() in do_diff_cache()
12886 Fix "git clone" for git:// protocol
12887 Adjust .gitignore for 5884f1(Rename 'git-help--browse.sh'...)
12888 Introduce the config variable pack.packSizeLimit
12889 bisect view: check for MinGW32 and MacOSX in addition to X11
12890 xdl_merge(): make XDL_MERGE_ZEALOUS output simpler
12891 xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUM
12892 completion: support format-patch's --cover-letter option
12893 path-list: add functions to work with unsorted lists
12894 parseopt: add flag to stop on first non option
12895 Test "git remote show" and "git remote prune"
12896 Make git-remote a builtin
12897 builtin-remote: prune remotes correctly that were added with --mirror
12898 Fix make_absolute_path() for parameters without a slash
12899 format-patch: use the diff options for the cover letter, too
12900 format-patch: wrap cover-letter's shortlog sensibly
12901 remote show: Clean up connection correctly if object fetch wasn't done
12902 remote: fix "update [group...]"
12903 builtin remote rm: remove symbolic refs, too
12904 gc: call "prune --expire 2.weeks.ago" by default
12907 Fix misuse of prefix_path()
12908 gitk: Heed the lines of context in merge commits
12909 Technical documentation of the run-command API.
12910 prefix_path: use is_absolute_path() instead of *orig == '/'
12911 start_command(), .in/.out/.err = -1: Callers must close the file descriptor
12912 start_command(), if .in/.out > 0, closes file descriptors, not the callers
12913 git-submodule summary: fix that some "wc" flavors produce leading spaces
12916 man pages are littered with .ft C and others
12917 shortlog: do not require to run from inside a git repository
12919 Junichi Uekawa (1):
12920 git-blame.el: show the when, who and what in the minibuffer.
12922 Junio C Hamano (93):
12923 index: be careful when handling long names
12924 Avoid running lstat(2) on the same cache entry.
12925 read-cache.c: fix a couple more CE_REMOVE conversion
12926 read-cache.c: introduce is_racy_timestamp() helper
12928 Sane use of test_expect_failure
12929 test: reword the final message of tests with known breakages
12930 known breakage: revision range computation with clock skew
12931 fix misuse of prefix_path()
12932 builtin-apply.c: refactor small part that matches context
12933 builtin-apply.c: restructure "offset" matching
12934 builtin-apply.c: push match-beginning/end logic down
12935 builtin-apply.c: make it more line oriented
12936 builtin-apply.c: optimize match_beginning/end processing a bit.
12937 builtin-apply.c: mark common context lines in lineinfo structure.
12938 builtin-apply.c: clean-up apply_one_fragment()
12939 builtin-apply.c: simplify calling site to apply_line()
12940 builtin-apply.c: do not feed copy_wsfix() leading '+'
12941 builtin-apply.c: move copy_wsfix() function a bit higher.
12942 builtin-apply.c: pass ws_rule down to match_fragment()
12943 git-apply --whitespace=fix: fix whitespace fuzz introduced by previous run
12944 core.whitespace: cr-at-eol
12945 Documentation/SubmittingPatches: Instruct how to use [PATCH] Subject header
12946 Documentation/SubmittingPatches: discuss first then submit
12947 Documentation/SubmittingPatches: What's Acked-by and Tested-by?
12948 Make error messages from cherry-pick/revert more sensible
12949 setup: sanitize absolute and funny paths in get_pathspec()
12950 git-add: adjust to the get_pathspec() changes.
12951 builtin-mv: minimum fix to avoid losing files
12952 gitignore(5): Allow "foo/" in ignore list to match directory "foo"
12953 gitignore: lazily find dtype
12954 Define the project whitespace policy
12955 apply: do not barf on patch with too large an offset
12956 Update the main documentation (stale notes section)
12957 .mailmap: adjust to a recent patch application glitch.
12958 diff --relative: output paths as relative to the current subdirectory
12959 diff --relative: help working in a bare repository
12960 checkout: notice when the switched branch is behind or forked
12961 Documentation/SubmittingPatches - a suggested patch flow
12962 Sync with 1.5.4.2 and start 1.5.5 Release Notes
12963 sending errors to stdout under $PAGER
12964 merge-recursive: split low-level merge functions out.
12965 expose a helper function peel_to_type().
12966 checkout: tone down the "forked status" diagnostic messages
12967 checkout: work from a subdirectory
12968 git-reset --hard and git-read-tree --reset: fix read_cache_unmerged()
12969 checkout: updates to tracking report
12970 gitweb: Better chopping in commit search results
12971 Add merge-subtree back
12972 checkout: show progress when checkout takes long time while switching branches
12973 ws_fix_copy(): move the whitespace fixing function to ws.c
12974 checkout: error out when index is unmerged even with -m
12975 diff --dirstat: saner handling of binary and unmerged files
12976 url rewriting: take longest and first match
12977 git-apply --whitespace=fix: fix off by one thinko
12978 Revert "pack-objects: Print a message describing the number of threads for packing"
12979 git-remote: do not complain on multiple URLs for a remote
12980 format-patch: remove a leftover debugging message
12981 tests: introduce test_must_fail
12982 Update draft release notes for 1.5.5
12983 t6024: move "git reset" to prepare for a test inside the test itself
12984 CodingGuidelines: spell out how we use grep in our scripts
12985 find_unique_abbrev(): redefine semantics
12986 Clean up find_unique_abbrev() callers
12987 diff-lib.c: constness strengthening
12988 diff: make sure work tree side is shown as 0{40} when different
12989 Update draft release notes for 1.5.5
12990 describe --always: fall back to showing an abbreviated object name
12991 git-describe: use tags found in packed-refs correctly
12992 describe: fix --long output
12993 describe: re-fix display_name()
12994 t6120 (describe): check --long properly
12995 Revert "receive-pack: use strict mode for unpacking objects"
12996 Revert "unpack-objects: prevent writing of inconsistent objects"
12997 fsck.c: fix bogus "empty tree" check
12998 am: read from the right mailbox when started from a subdirectory
12999 am: remove support for -d .dotest
13001 get_pathspec(): die when an out-of-tree path is given
13002 Revert part of 744dacd (builtin-mv: minimum fix to avoid losing files)
13003 Revert part of 1abf095 (git-add: adjust to the get_pathspec() changes)
13004 Revert part of d089eba (setup: sanitize absolute and funny paths in get_pathspec())
13005 git-clean: add tests for relative path
13006 send-email: --no-signed-off-cc should suppress 'sob' cc
13007 traverse_trees_recursive(): propagate merge errors up
13008 git-gui: Simplify MSGFMT setting in Makefile
13009 Documentation/config: typofix
13010 Documentation/git-help: typofix
13011 read-tree() and unpack_trees(): use consistent limit
13012 Redo "add test_cmp function for test scripts"
13013 git-gui: Improve directions regarding POT update in po/README
13014 Resurrect git-rerere to contrib/examples
13015 Update draft release notes for 1.5.5
13017 Karl Hasselström (2):
13018 git-svn: Don't call git-repack anymore
13019 Let "git svn" run "git gc --auto" occasionally
13022 bash: Properly quote the GIT_DIR at all times to fix subdirectory paths with spaces
13024 Kristian Høgsberg (1):
13025 wt-status.c: no need for dup() dance anymore
13028 Simplify setup of $GIT_DIR in git-sh-setup.sh
13030 Linus Torvalds (22):
13031 Make on-disk index representation separate from in-core one
13032 Make run_diff_index() use unpack_trees(), not read_tree()
13033 Create pathname-based hash-table lookup into index
13034 Add "--dirstat" for some directory statistics
13035 gitk: learn --show-all output
13036 Add "--show-all" revision walker flag for debugging
13037 Fix name re-hashing semantics
13038 Name hash fixups: export (and rename) remove_hash_entry
13039 Use helper function for copying index entry information
13040 Be more verbose when checkout takes a long time
13041 Add 'df_name_compare()' helper function
13042 Make 'traverse_tree()' use linked structure rather than 'const char *base'
13043 Add return value to 'traverse_tree()' callback
13044 Make 'traverse_trees()' traverse conflicting DF entries in parallel
13045 Move 'unpack_trees()' over to 'traverse_trees()' interface
13046 Fix tree-walking compare_entry() in the presense of --prefix
13047 Add 'const' where appropriate to index handling functions
13048 Make 'unpack_trees()' take the index to work on as an argument
13049 Make 'unpack_trees()' have a separate source and destination index
13050 unpack_trees(): minor memory leak fix in unused destination index
13051 unpack_trees(): fix diff-index regression.
13052 Fix recent 'unpack_trees()'-related changes breaking 'git stash'
13054 Marco Costalba (1):
13055 Avoid a useless prefix lookup in strbuf_expand()
13058 git-submodule - Allow adding a submodule in-place
13060 Martin Koegler (28):
13061 git-fsck: report missing author/commit line in a commit as an error
13062 parse_object_buffer: don't ignore errors from the object specific parsing functions
13063 deref_tag: handle return value NULL
13064 deref_tag: handle tag->tagged = NULL
13065 check return code of prepare_revision_walk
13066 read_object_with_reference: don't read beyond the buffer
13067 get_sha1_oneline: check return value of parse_object
13068 mark_blob/tree_uninteresting: check for NULL
13069 reachable.c::add_one_tree: handle NULL from lookup_tree
13070 list-objects.c::process_tree/blob: check for NULL
13071 check results of parse_commit in merge_bases
13072 process_tag: handle tag->tagged == NULL
13073 reachable.c::process_tree/blob: check for NULL
13074 revision.c: handle tag->tagged == NULL
13075 parse_commit: don't fail, if object is NULL
13076 check return value from parse_commit() in various functions
13077 peel_onion: handle NULL
13078 add generic, type aware object chain walker
13079 builtin-fsck: move away from object-refs to fsck_walk
13080 Remove unused object-ref code
13081 builtin-fsck: reports missing parent commits
13082 builtin-fsck: move common object checking code to fsck.c
13083 add common fsck error printing function
13084 unpack-object: cache for non written objects
13085 unpack-objects: prevent writing of inconsistent objects
13086 index-pack: introduce checking mode
13087 receive-pack: use strict mode for unpacking objects
13088 fetch-pack: check parse_commit/object results
13090 Matthias Kestenholz (1):
13091 Add color.ui variable which globally enables colorization if set
13093 Michael Witten (3):
13094 git-send-email: ssh/login style password requests
13095 git-send-email: SIG{TERM,INT} handlers
13096 git-send-email: Better handling of EOF
13099 Add compat/snprintf.c for systems that return bogus
13100 autoconf: Test FREAD_READS_DIRECTORIES
13102 Michele Ballabio (7):
13103 gitk: Fix "Key bindings" message
13104 git-gui: fix typo in lib/spellcheck.tcl
13105 builtin-for-each-ref.c: fix typo in error message
13106 gitk: Mark another string for translation
13107 git-gui: update Italian translation
13108 gitk: initial Italian translation
13109 git-gui: remove spurious "fuzzy" attributes in po/it.po
13112 Work around curl-gnutls not liking to be reinitialized
13113 Add test for git rebase --abort
13114 Documentation/git-rebase.txt: Add --strategy to synopsys
13115 git rebase --abort: always restore the right commit
13116 t3407-rebase-abort.sh: Enhance existing tests, and add test for rebase --merge
13119 git-clean: handle errors if removing files fails
13120 Improve t6029 to check the real "subtree" case
13121 Update Hungarian translation. 100% completed.
13122 git-gui: Updated Hungarian translation (e5fba18)
13124 Nanako Shiraishi (2):
13125 git-gui: Update Japanese translation
13126 git-gui: Update Japanese translation
13129 factorize revindex code out of builtin-pack-objects.c
13130 make verify_one_pack() a bit less wrong wrt packed_git structure
13131 fix unimplemented packed_object_info_detail() features
13132 add storage size output to 'git verify-pack -v'
13133 pack-objects: proper pack time stamping with --max-pack-size
13136 git-commit: support variable number of hook arguments
13137 git-commit: set GIT_EDITOR=: if editor will not be launched
13138 git-commit: Refactor creation of log message.
13139 git-commit: add a prepare-commit-msg hook
13141 Paul Mackerras (3):
13142 gitk: Only restore window size from ~/.gitk, not position
13143 gitk: Avoid Tcl error when switching views
13144 gitk: Default to using po2msg.sh if msgfmt doesn't grok --tcl, -l and -d
13146 Pekka Kaitaniemi (1):
13147 gitk: Add horizontal scrollbar to the diff view
13149 Peter Karlsson (2):
13150 git-gui: Regenerated po template and merged translations with it
13151 git-gui: updated Swedish translation
13154 gitweb: Clearly distinguish regexp / exact match searches
13156 Philipp A. Hartmann (1):
13157 git-gui: if a background colour is set, set foreground colour as well
13159 Philippe Bruhat (3):
13160 cvsimport: have default merge regex allow for dashes in the branch name
13161 cvsimport: allow for multiple -M options
13162 cvsimport: document that -M can be used multiple times
13164 Pierre Habouzit (4):
13165 git-describe: Add a --match option to limit considered tags.
13166 git-name-rev: add a --(no-)undefined option.
13167 parse-opt: bring PARSE_OPT_HIDDEN and NONEG to git-rev-parse --parseopt
13168 parse-options: new option type to treat an option-like parameter as an argument.
13171 git-submodule summary: code framework
13172 git-submodule summary: show commit summary
13173 git-submodule summary: limit summary size
13174 git-submodule summary: documentation
13175 git-submodule summary: test
13177 Rafael Garcia-Suarez (1):
13178 Make git-remote.perl "use strict" compliant
13180 Ralf Wildenhues (1):
13183 Robin Rosenberg (2):
13184 Make blame accept absolute paths
13185 Improve bash prompt to detect various states like an unfinished merge
13188 bash: add git-branch options
13189 bash: git-branch -d and -m lists only local branches
13190 bash: remove unnecessary conditions when checking for subcommands
13191 bash: refactor searching for subcommands on the command line
13192 bash: add new 'git stash' subcommands
13193 bash: add 'git svn' subcommands and options
13194 bash: use __gitdir when completing 'git rebase' options
13195 bash: fix long option with argument double completion
13196 update 'git rebase' documentation
13198 Samuel Tardieu (1):
13199 "remote update": print remote name being fetched from
13202 git-bundle.txt: Add different strategies to create the bundle
13203 git-describe: --long shows the object name even for a tagged commit
13204 clone: support cloning full bundles
13206 Sebastian Noack (1):
13207 git-svn: Don't prompt for client cert password everytime.
13209 Shawn O. Pearce (37):
13210 git-gui: Automatically spell check commit messages as the user types
13211 git-gui: Paper bag fix bad string length call in spellchecker
13212 git-gui: Correct size of dictionary name widget in options dialog
13213 Include annotated tags in fast-import crash reports
13214 Include the fast-import marks table in crash reports
13215 Finish current packfile during fast-import crash handler
13216 Update fast-import documentation to discuss crash reports
13217 Teach git-grep --name-only as synonym for -l
13218 git-gui: Ensure all spellchecker 'class' variables are initialized
13219 git-gui: Remove explicit references to 'aspell' in message strings
13220 git-gui: Only bind the spellcheck popup suggestion hook once
13221 git-gui: Catch and display aspell startup failures to the user
13222 git-gui: Gracefully display non-aspell version errors to users
13223 git-gui: Shorten Aspell version strings to just Aspell version number
13224 Optimize peel_ref for the current ref of a for_each_ref callback
13225 Teach git-describe to use peeled ref information when scanning tags
13226 Avoid accessing non-tag refs in git-describe unless --all is requested
13227 Teach git-describe --exact-match to avoid expensive tag searches
13228 Use git-describe --exact-match in bash prompt on detached HEAD
13229 Teach git-describe to verify annotated tag names before output
13230 Remove unused variable in builtin-fetch find_non_local_tags
13231 Remove unnecessary delaying of free_refs(ref_map) in builtin-fetch
13232 Ensure tail pointer gets setup correctly when we fetch HEAD only
13233 Allow builtin-fetch's find_non_local_tags to append onto a list
13234 Free the path_lists used to find non-local tags in git-fetch
13235 Teach upload-pack to log the received need lines to an fd
13236 Make git-fetch follow tags we already have objects for sooner
13237 Teach git-fetch to grab a tag at the same time as a commit
13238 Don't allow git-describe failures to go unnoticed in t6120
13239 Test for packed tags in git-describe output
13240 Add git-describe test for "verify annotated tag names on output"
13241 git-pack-objects: Automatically pack annotated tags if object was packed
13242 Teach fetch-pack/upload-pack about --include-tag
13243 Teach git-fetch to exploit server side automatic tag following
13244 bash: Remove completion of core.legacyheaders option
13245 git-gui: Don't translate the special Apple menu
13246 git-gui: Adjusted Japanese translation to updated POT
13248 Simon Hausmann (7):
13249 git-p4: Fix submit user-interface.
13250 git-p4: Ensure the working directory and the index are clean before "git-p4 rebase"
13251 git-p4: Remove --log-substitutions feature.
13252 git-p4: Clean up git-p4 submit's log message handling.
13253 git-p4: Removed git-p4 submit --direct.
13254 git-p4: git-p4 submit cleanups.
13255 git-p4: Fix import of changesets with file deletions
13257 Steffen Prohaska (4):
13258 safecrlf: Add mechanism to warn about irreversible crlf conversions
13259 gitk: Add checkbutton to ignore space changes
13260 t4014: Replace sed's non-standard 'Q' by standard 'q'
13261 Add tests for filesystem challenges (case and unicode normalization)
13264 bash: Add more long options to be completed with "git --<TAB>"
13267 Add `git svn blame' command
13270 git-p4: Fix indentation from tab to spaces
13273 git-p4: Fix an obvious typo
13274 git-p4: support exclude paths
13276 Tor Arvid Lund (1):
13277 git-p4: Support usage of perforce client spec
13279 Uwe Kleine-König (1):
13280 rev-list: add --branches, --tags and --remotes
13283 Add an --argscmd flag to get the list of refs to show
13286 git-gui: translate the remaining messages in zh_cn.po to chinese
13289 Version v1.5.4.5; changes since v1.5.4.4:
13290 -----------------------------------------
13292 Andy Whitcroft (1):
13293 shortlog: take the first populated line of the description
13296 git-new-workdir: Share SVN meta data between work dirs and the repository
13299 t/t3800-mktag.sh: use test_must_fail rather than '!'
13301 Clemens Buchacher (1):
13302 merge-recursive: handle file mode changes
13304 Daniel Barkalow (2):
13305 Tighten refspec processing
13306 Fix branches file configuration
13309 git-svn: don't blindly append '*' to branch/tags config
13312 Fix the wrong output of `git-show v1.3.0~155^2~4` in documentation.
13314 Jakub Narebski (1):
13315 gitweb: Fix bug in href(..., -replay=>1) when using 'pathinfo' form
13318 t0021: tr portability fix for Solaris
13319 Documentation: clarify use of .git{ignore,attributes} versus .git/info/*
13321 Johannes Schindelin (3):
13322 launch_editor(): allow spaces in the filename
13323 git fetch: Take '-n' to mean '--no-tags'
13324 merge-file: handle empty files gracefully
13327 Make man page building quiet when DOCBOOK_XSL_172 is defined
13329 Junio C Hamano (9):
13330 filter-branch: handle "disappearing tree" case correctly in subdir filter
13331 git-pull documentation: warn about the option order
13332 quiltimport: fix misquoting of parsed -p<num> parameter
13333 format-patch: generate MIME header as needed even when there is format.header
13334 rebase -m: do not trigger pre-commit verification
13335 Start draft ReleaseNotes for 1.5.4.5
13336 git-fetch test: test tracking fetch results, not just FETCH_HEAD
13337 Update draft release notes for 1.5.4.5
13340 Linus Torvalds (1):
13341 rev-parse: fix meaning of rev~ vs rev~0.
13343 Marc-Andre Lureau (2):
13344 git-svn: fix find-rev error message when missing arg
13345 git-cvsimport: fix merging with remote parent branch
13348 git rebase --abort: always restore the right commit
13350 Pierre Habouzit (1):
13351 git-quiltimport: better parser to grok "enhanced" series files.
13354 Minor wording changes in the keyboard descriptions in git-add --interactive.
13357 Version v1.5.4.4; changes since v1.5.4.3:
13358 -----------------------------------------
13361 Really make the LF after reset in fast-import optional
13363 Björn Steinbrink (1):
13364 receive-pack: Initialize PATH to include exec-dir.
13367 builtin-reflog.c: don't install new reflog on write failure
13370 Documentation/git-am.txt: Pass -r in the example invocation of rm -f .dotest
13372 Caio Marcelo de Oliveira Filho (1):
13373 filter-branch documentation: non-zero exit status in command abort the filter
13376 Eliminate confusing "won't bisect on seeked tree" failure
13378 Daniel Barkalow (3):
13379 Use a single implementation and API for copy_file()
13380 Don't use GIT_CONFIG in t5505-remote
13381 Correct name of diff_flush() in API documentation
13384 templates/Makefile: don't depend on local umask setting
13385 git-merge.sh: better handling of combined --squash,--no-ff,--no-commit options
13388 rev-parse: fix potential bus error with --parseopt option spec handling
13389 send-email: fix In-Reply-To regression
13392 revert: actually check for a dirty index
13395 Add testcase for 'git cvsexportcommit -w $cvsdir ...' with relative $GIT_DIR
13396 Fix 'git cvsexportcommit -w $cvsdir ...' when used with relative $GIT_DIR
13398 Johannes Schindelin (4):
13399 http-push: avoid invalid memory accesses
13400 http-push: do not get confused by submodules
13401 http-push: avoid a needless goto
13402 cvsexportcommit: be graceful when "cvs status" reorders the arguments
13405 daemon: send more error messages to the syslog
13406 daemon: ensure that base-path is an existing directory
13409 Fix dcommit, rebase when rewriteRoot is in use
13411 Jonathan del Strother (1):
13412 Prompt to continue when editing during rebase --interactive
13414 Junio C Hamano (6):
13415 Fix "git log --merge --left-right"
13416 Start preparing for 1.5.4.4
13417 tests: introduce test_must_fail
13418 Update draft release notes for 1.5.4.4
13419 test-lib: fix TERM to dumb for test repeatability
13423 Fix incorrect wording in git-merge.txt.
13426 Set proxy override with http_init()
13427 Fix random crashes in http_cleanup()
13430 Documentation cherry-pick: Fix cut-and-paste error
13433 Documentation/git-filter-branch: add a new msg-filter example
13434 Documentation/git svn log: add a note about timezones.
13436 Pierre Habouzit (1):
13437 unquote_c_style: fix off-by-one.
13440 git-submodule: Fix typo 'url' which should be '$url'
13443 git.el: find the git-status buffer whatever its name is
13446 ident.c: reword error message when the user name cannot be determined
13448 Sebastian Noack (1):
13449 git-svn: Don't prompt for client cert password everytime.
13451 Shawn O. Pearce (6):
13452 Ensure 'make dist' compiles git-archive.exe on Cygwin
13453 Protect peel_ref fallback case from NULL parse_object result
13454 Correct fast-export file mode strings to match fast-import standard
13455 git-gui: Paper bag fix info dialog when no files are staged at commit
13456 Fix 'git remote show' regression on empty repository in 1.5.4
13457 git-gui: Gracefully fall back to po2msg.sh if msgfmt --tcl fails
13460 timezone_names[]: fixed the tz offset for New Zealand.
13462 Uwe Kleine-König (1):
13463 config.txt: refer to --upload-pack and --receive-pack instead of --exec
13466 Version v1.5.4.3; changes since v1.5.4.2:
13467 -----------------------------------------
13470 git-clone.sh: properly configure remote even if remote's head is dangling
13473 git-gui: support Git Gui.app under OS X 10.5
13474 send-email: squelch warning due to comparing undefined $_ to ""
13477 push: indicate partialness of error message
13478 Documentation/push: clarify matching refspec behavior
13479 push: document the status output
13480 hash: fix lookup_hash semantics
13482 Junio C Hamano (1):
13485 Kristian Høgsberg (1):
13486 Rename git-core rpm to just git and rename the meta-pacakge to git-all.
13489 Documentation/git-stash: document options for git stash list
13491 Pekka Kaitaniemi (1):
13492 Clarified the meaning of git-add -u in the documentation
13494 Shawn O. Pearce (5):
13495 git-gui: Ensure error dialogs always appear over all other windows
13496 git-gui: Paper bag fix error dialogs opening over the main window
13497 git-gui: Default TCL_PATH to same location as TCLTK_PATH
13498 git-gui: Avoid hardcoded Windows paths in Cygwin package files
13499 git-gui: Focus insertion point at end of strings in repository chooser
13501 Wincent Colaiuta (1):
13502 git-gui: relax "dirty" version detection
13505 Version v1.5.4.2; changes since v1.5.4.1:
13506 -----------------------------------------
13508 Christian Couder (8):
13509 config: add test cases for empty value and no value config variables.
13510 diff.c: replace a 'strdup' with 'xstrdup'.
13511 diff.c: remove useless check for value != NULL
13512 config: add 'git_config_string' to refactor string config variables.
13513 Add "const" qualifier to "char *pager_program".
13514 Add "const" qualifier to "char *editor_program".
13515 Add "const" qualifier to "char *excludes_file".
13516 diff.c: add "const" qualifier to "char *cmd" member of "struct ll_diff_driver"
13518 Daniel Barkalow (1):
13519 Validate nicknames of remote branches to prohibit confusing ones
13521 David Steven Tweed (1):
13522 Make git prune remove temporary packs that look like write failures
13524 Frank Lichtenheld (1):
13525 config: Fix --unset for continuation lines
13528 builtin-commit: remove .git/SQUASH_MSG upon successful commit
13529 cvsimport: have default merge regex also match beginning of commit message
13532 Add a BuildRequires for gettext in the spec file.
13535 mailinfo: feed only one line to handle_filter() for QP input
13538 status: suggest "git rm --cached" to unstage for initial commit
13539 commit: discard index after setting up partial commit
13541 Johannes Schindelin (3):
13542 bisect: allow starting with a detached HEAD
13543 Document that the default of branch.autosetupmerge is true
13544 bisect: use verbatim commit subject in the bisect log
13547 upload-pack: Initialize the exec-path.
13550 man pages are littered with .ft C and others
13552 Junio C Hamano (31):
13553 git-pull documentation: fix markup
13554 archive-tar.c: guard config parser from value=NULL
13555 Add config_error_nonbool() helper function
13556 builtin-apply.c: guard config parser from value=NULL
13557 builtin-branch.c: guard config parser from value=NULL
13558 builtin-commit.c: guard config parser from value=NULL
13559 builtin-config.c: guard config parser from value=NULL
13560 builtin-log.c: guard config parser from value=NULL
13561 builtin-reflog.c: guard config parser from value=NULL
13562 builtin-show-branch.c: guard config parser from value=NULL
13563 builtin-tag.c: guard config parser from value=NULL
13564 connect.c: guard config parser from value=NULL
13565 convert.c: guard config parser from value=NULL
13566 diff.c: guard config parser from value=NULL
13567 git.c: guard config parser from value=NULL
13568 help.c: guard config parser from value=NULL
13569 http.c: guard config parser from value=NULL
13570 merge-recursive.c: guard config parser from value=NULL
13571 remote.c: guard config parser from value=NULL
13572 setup.c: guard config parser from value=NULL
13573 wt-status.c: guard config parser from value=NULL
13574 imap-send.c: guard config parser from value=NULL
13575 builtin-log.c: guard config parser from value=NULL
13576 config.c: guard config parser from value=NULL
13577 Revert "pack-objects: only throw away data during memory pressure"
13578 Protect get_author_ident_from_commit() from filenames in work tree
13579 diff.c: fixup garding of config parser from value=NULL
13580 diff: Fix miscounting of --check output
13581 filter-branch: handle filenames that need quoting
13582 Documentation/git-reset:
13585 Martin Koegler (1):
13586 pack-objects: only throw away data during memory pressure
13589 Work around curl-gnutls not liking to be reinitialized
13592 builtin-gc.c: guard config parser from value=NULL
13593 git clone -s documentation: force a new paragraph for the NOTE
13596 Documentation/git-reset: don't mention --mixed for selected-paths reset
13597 Documentation/git-reset: Add an example of resetting selected paths
13599 Sergei Organov (1):
13600 git-cvsimport.txt: fix '-M' description.
13602 Shawn O. Pearce (1):
13603 fast-import: check return value from unpack_entry()
13606 hg-to-git: fix parent analysis
13608 Uwe Kleine-König (1):
13609 rebase -i: accept -m as advertised in the man page
13612 Version v1.5.4.1; changes since v1.5.4:
13613 ---------------------------------------
13616 INSTALL: git-merge no longer uses cpio
13619 Documentation/git-stash.txt: Adjust SYNOPSIS command syntax (2)
13621 Junio C Hamano (3):
13622 Update stale documentation links from the main documentation.
13623 Fix "git-commit -C $tag"
13624 gitattributes: fix relative path matching
13627 git-am: fix type in its usage string
13628 git-remote documentation: fix synopsis to match description
13631 Fix typo in 'blame' documentation.
13634 Fix parsing numeric color values
13637 Version v1.5.4; changes since v1.5.4-rc5:
13638 -----------------------------------------
13641 git-relink: avoid hard linking in objects/info directory
13642 filter-branch.sh: remove temporary directory on failure
13643 filter-branch docs: remove brackets so not to imply revision arg is optional
13644 filter-branch: assume HEAD if no revision supplied
13647 gitweb: Make use of the $git_dir variable at sub git_get_project_description
13649 Christian Couder (3):
13650 Documentation: config: add "browser.<tool>.path".
13651 Documentation: help: specify supported html browsers.
13652 instaweb: use 'browser.<tool>.path' config option if it's set.
13654 Jakub Narebski (1):
13655 gitweb: Add info about $projectroot and $projects_list to gitweb/README
13657 Jean-Luc Herren (1):
13658 Documentation/git-cvsserver: Fix typo
13661 t9001: add missing && operators
13666 Johannes Schindelin (1):
13667 Add test for rebase -i with commits that do not pass pre-commit
13669 Junio C Hamano (4):
13670 reflog-expire: Avoid creating new files in a directory inside readdir(3) loop
13671 Revert "filter-branch docs: remove brackets so not to imply revision arg is optional"
13672 Fix "git checkout -b foo ':/substring'"
13675 Michele Ballabio (1):
13676 Fix typo in a comment in t/test-lib.sh
13679 git rev-parse manpage: spelling fix
13681 Shawn O. Pearce (1):
13682 Use 'printf %s $x' notation in t5401
13685 gitweb: Convert generated contents to utf8 in commitdiff_plain
13688 Version v1.5.4-rc5; changes since v1.5.4-rc4:
13689 ---------------------------------------------
13692 Make t5710 more strict when creating nested repos
13695 git-commit: exit non-zero if we fail to commit the index
13698 git-svn: default to repacking every 1000 commits
13700 Gustaf Hendeby (1):
13701 send-email, fix breakage in combination with --compose
13703 Jakub Narebski (1):
13704 autoconf: define NO_SYS_SELECT_H on systems without <sys/select.h>.
13706 Johannes Schindelin (1):
13707 pull --rebase: be cleverer with rebased upstream branches
13709 Junio C Hamano (5):
13710 git-submodule: rename shell functions for consistency
13711 git-submodule: fix subcommand parser
13712 git-submodule: add test for the subcommand parser fix
13713 Clarify that http-push being temporarily disabled with older cURL
13717 Add a missing dependency on http.h
13718 Documentation: add a bit about sendemail.to configuration
13721 git-clone -s: document problems with git gc --prune
13722 git pull manpage: don't include -n from fetch-options.txt
13725 pack-objects: Fix segfault when object count is less than thread count
13727 Pierre Habouzit (1):
13728 parse-options: catch likely typo in presense of aggregated options.
13730 Robert Schiele (2):
13731 pre-POSIX.1-2001 systems do not have <sys/select.h>
13732 Makefile: customization for supporting HP-UX
13735 git-svn(1): update instructions for resuming a git-svn clone
13737 Shawn O. Pearce (10):
13738 git-gui: Honor the standard commit-msg hook
13739 git-gui: Correct window title for hook failure dialogs
13740 git-gui: Consolidate hook execution code into a single function
13741 git-gui: Correct encoding of glossary/fr.po to UTF-8
13742 Teach fast-import to honor pack.compression and pack.depth
13743 Document the hairy gfi_unpack_entry part of fast-import
13744 git-gui: Work around random missing scrollbar in revision list
13745 git-gui: Fallback to Tcl based po2msg.sh if msgfmt isn't available
13746 git-gui: Make the statistics of po2msg match those of msgfmt
13747 git-gui: Correctly cleanup msgfmt '1 message untranslated' output
13749 Steffen Prohaska (3):
13750 submodule: Document the details of the command line syntax
13751 t9400-git-cvsserver-server: Wrap setup into test case
13752 cvsserver: Fix for histories with multiple roots
13755 Version v1.5.4-rc4; changes since v1.5.4-rc3:
13756 ---------------------------------------------
13759 Correct spelling in diff.c comment
13762 close_lock_file(): new function in the lockfile API
13763 Improve use of lockfile API
13764 refs.c: rework ref_locks by abstracting from underlying struct lock_file
13765 fast-import.c: don't try to commit marks file if write failed
13767 Christian Couder (2):
13768 git-gui: Initial french translation
13769 git-gui: add french glossary: glossary/fr.po
13771 Christian Stimming (4):
13772 git-gui: Update glossary: add term "hunk"
13773 git-gui: Update German translation
13774 git-gui: Fix broken revert confirmation.
13775 git-gui: Improve German translation.
13778 Remove usage of git- (dash) commands from email hook
13779 cvsimport: remove last use of repo-config from git standard tools
13780 Update git-completion for new 'remote rm' option
13782 Dave Peticolas (1):
13783 Documentation: fix and clarify grammar in git-merge docs.
13785 Dmitry Potapov (1):
13786 treat any file with NUL as binary
13789 git-svn: handle leading/trailing whitespace from svnsync revprops
13791 Grégoire Barbier (4):
13792 http-push: disable http-push without USE_CURL_MULTI
13793 http-push: fix webdav lock leak.
13794 http-push: fail when info/refs exists and is already locked
13795 http-push and http-fetch: handle URLs without trailing /
13797 Jakub Narebski (1):
13798 autoconf: Add checking for unsetenv function
13800 Jean-Luc Herren (1):
13801 Make default pre-commit hook less noisy
13804 git-clean: fix off-by-one memory access when given no arguments
13805 color unchanged lines as "plain" in "diff --color-words"
13806 send-email: detect invocation errors earlier
13807 send-email: validate patches before sending anything
13808 send-email: add no-validate option
13811 fast-import: Don't use a maybe-clobbered errno value
13812 doc typo: s/prior committing/prior to committing/
13814 Johannes Schindelin (1):
13815 gitk: make Ctrl "+" really increase the font size
13817 Junio C Hamano (8):
13818 builtin-commit.c: remove useless check added by faulty cut and paste
13819 Revert "builtin-commit.c: remove useless check added by faulty cut and paste"
13820 Fix git-rerere documentation
13821 Squelch bogus progress output from git-rebase--interactive
13822 Document lockfile API
13823 Officially deprecate repo-config.
13824 http-push: clarify the reason of error from the initial PROPFIND request
13827 Kristian Høgsberg (1):
13828 git-commit: fix double close(2) that can close a wrong file descriptor
13831 Move sha1_file_to_archive into libgit
13833 Linus Torvalds (4):
13834 Fix performance regression for partial commits
13835 Make builtin-commit.c more careful about parenthood
13836 Make 'git fsck' complain about non-commit branches
13837 Be more careful about updating refs
13840 hg-to-git: improve popen calls
13843 git-gui: Makefile - Handle $DESTDIR on Cygwin
13845 Martin Koegler (1):
13846 parse_commit_buffer: tighten checks while parsing
13849 Add using merge subtree How-To
13850 ls-remote: add -t and -h options.
13851 Include rev-list options in git-log manpage.
13853 Peter Karlsson (1):
13854 git-gui: Updated Swedish translation after mailing list review.
13856 Shawn O. Pearce (3):
13857 git-gui: Allow 'Create New Repository' on existing directories
13858 git-gui: Refresh file status description after hunk application
13859 Fix random fast-import errors when compiled with NO_MMAP
13862 core-tutorial typofix
13865 Version v1.5.4-rc3; changes since v1.5.4-rc2:
13866 ---------------------------------------------
13868 Alexandre Julliard (6):
13869 git.el: Support for getting diffs from inside the log-edit buffer.
13870 git.el: Retrieve the permissions for up-to-date files.
13871 git.el: Display file types and type changes.
13872 git.el: Make sure we never insert the same file twice.
13873 git.el: Refresh files from their real state upon commit.
13874 git.el: Make status refresh faster.
13877 git-gui: Make commit log messages end with a newline
13880 git-relink.txt: describe more clearly how hard linking occurs
13882 Charles Bailey (1):
13883 gitk: Fix the Makefile to cope with systems lacking msgfmt
13885 Christian Couder (1):
13886 Documentation: config: add 'help.*' and 'instaweb.*' variables.
13888 Christian Stimming (10):
13889 gitk i18n: Add Makefile with rules for po file creation and installation
13890 gitk i18n: Import msgcat for message string translation; load translation catalogs
13891 gitk i18n: Markup several strings for translation
13892 gitk i18n: Initial German translation
13893 gitk i18n: More markup -- various options menus
13894 gitk i18n: Recode gitk from latin1 to utf8 so that the (c) copyright character is valid utf8.
13895 gitk: Update and fix Makefile
13896 gitk: Update German translation
13897 gitk: Fix typo in user message.
13898 gitk: Update German translation.
13901 Documentation: rename gitlink macro to linkgit
13904 git-svn: allow dcommit --no-rebase to commit multiple, dependent changes
13905 git-svn: unlink index files that were globbed, too
13906 git-svn: support for funky branch and project names over HTTP(S)
13907 git-svn: clarify the "Ignoring error from SVN" piece
13909 Florian La Roche (1):
13910 Change git-gc documentation to reflect gc.packrefs implementation.
13913 gitk: use user-configured background in view definition dialog
13915 Grégoire Barbier (1):
13916 Fix double-free() in http-push.c:remote_exists()
13918 Gustaf Hendeby (1):
13919 Documentation/user-manual.txt: fix typo
13921 J. Bruce Fields (1):
13922 Documentation: fix remote.<name>.skipDefaultUpdate description
13925 Make the git metapackage require the same version of the subpackages.
13928 config: handle lack of newline at end of file better
13929 git-reset: refuse to do hard reset in a bare repository
13930 add a "basic" diff config callback
13931 diff: load funcname patterns in "basic" config
13932 diff: remove lazy config loading
13933 add--interactive: remove unused diff colors
13934 add--interactive: allow diff colors without interactive colors
13935 Document the color.interactive semantics
13938 Fix grammar nits in documentation and in code comments.
13939 Don't access line[-1] for a zero-length "line" from fgets.
13940 bundle, fast-import: detect write failure
13942 Johannes Schindelin (2):
13943 Optimize prefixcmp()
13944 shortlog: mention the "-e" option in the usage
13947 git-gui: Move frequently used commands to the top of the context menu.
13948 recv_sideband: Do not use ANSI escape sequence on dumb terminals.
13950 Junio C Hamano (27):
13951 Documentation/git-submodule.txt: typofix
13952 "git pull --tags": error out with a better message.
13953 git-rebase -i behaves better on commits with incomplete messages
13954 git-rebase -i: clean-up error check codepath.
13955 lock_any_ref_for_update(): reject wildcard return from check_ref_format
13956 Update callers of check_ref_format()
13957 Uninline prefixcmp()
13958 git-clean: make "Would remove ..." path relative to cwd again
13959 t/t7600: avoid GNUism in grep
13960 t/t{3600,3800,5401}: do not use egrep when grep would do
13961 t/t3800: do not use a temporary file to hold expected result.
13962 Update draft release notes for 1.5.4
13963 git-stash clear: refuse to work with extra parameter for now
13964 git-rev-parse --symbolic-full-name
13965 filter-branch: work correctly with ambiguous refnames
13966 custom pretty format: tolerate empty e-mail address
13967 Documentation: remove gitman.info with "make clean"
13968 Documentation: fix "gitlink::foobar[s]"
13969 utf8: pick_one_utf8_char()
13970 utf8_width(): allow non NUL-terminated input
13971 diff: do not chomp hunk-header in the middle of a character
13972 Update draft release notes for 1.5.4
13974 "git-apply --check" should not report "fixed"
13975 pack-objects: remove redundant and wrong call to deflateEnd()
13976 RPM spec: include gitk message files.
13980 Trim leading / off of paths in git-svn prop_walk
13982 Marco Costalba (2):
13983 Document git-reset defaults to HEAD if no commit is given
13984 git-stash: use stdout instead of stderr for non error messages
13987 git-gui: Unconditionally use absolute paths with Cygwin
13988 Documentation/Makefile - honor $DESTDIR for quick-install target
13990 Martin Koegler (4):
13991 receive-pack: check object type of sha1 before using them as commits
13992 receive-pack: reject invalid refnames
13993 parse_tag_buffer: don't parse invalid tags
13994 tree-walk: don't parse incorrect entries
13996 Michael Stefaniuc (1):
13997 git-am: Run git gc only once and not for every patch.
13999 Michele Ballabio (1):
14000 Document some default values in config.txt
14003 git-sh-setup: document git_editor() and get_author_ident_from_commit()
14004 t/t7001: avoid unnecessary ERE when using grep
14007 slightly better auto gc message
14009 Paul Mackerras (2):
14010 gitk: Recode de.po to UTF-8
14011 gitk: Restore some widget options whose defaults changed in Tk 8.5
14013 Peter Karlsson (1):
14014 Added Swedish translation.
14016 Ralf Wildenhues (1):
14017 Documentation: typofix
14020 Allow git-mergetool to handle paths with a leading space
14022 Shawn O. Pearce (1):
14023 git-gui: Handle file mode changes (644->755) in diff viewer
14026 Version v1.5.4-rc2; changes since v1.5.4-rc1:
14027 ---------------------------------------------
14030 Allow selection of different cleanup modes for commit messages
14032 Arjen Laarhoven (1):
14033 Fix "git log --diff-filter" bug
14035 Charles Bailey (1):
14036 Remove old generated files from .gitignore.
14038 Gustaf Hendeby (2):
14039 Make git send-email accept $EDITOR with arguments
14040 shortlog manpage documentation: work around asciidoc markup issues
14042 Jakub Narebski (1):
14043 gitweb: fix whitespace in config_to_multi (indent with tab)
14046 clean up 1.5.4 release notes
14047 cvsimport: die on cvsps errors
14050 Don't dereference NULL upon lookup failure.
14052 Johannes Schindelin (2):
14053 Teach diff machinery to display other prefixes than "a/" and "b/"
14054 Mention git-shell's "cvs" substitution in the RelNotes
14056 Junio C Hamano (14):
14057 t4024: fix test script to use simpler sed pattern
14058 fix git commit --amend -m "new message"
14059 shell-scripts usage(): consistently exit with non-zero
14060 Documentation: ls-files -v is about "assume unchanged".
14061 Fix $EDITOR regression introduced by rewrite in C.
14062 t7005: do not exit inside test.
14063 builtin-commit: fix amending of the initial commit
14064 builtin-commit: avoid double-negation in the code.
14065 Documentation: describe 'union' low-level merge driver
14066 Fix documentation of --first-parent in git-log and copy it to git-rev-list
14067 combine-diff: Fix path quoting
14068 Fix rewrite_diff() name quoting.
14069 contrib: resurrect scripted git-revert.
14072 Linus Torvalds (1):
14073 Re(-re)*fix trim_common_tail()
14076 everyday: replace 'prune' and 'repack' with 'gc'
14078 Pierre Habouzit (3):
14079 git-tag: fix -l switch handling regression.
14080 Force the sticked form for options with optional arguments.
14081 parse-options: Add a gitcli(5) man page.
14084 Make "--pretty=format" parser a bit more careful.
14086 Shawn O. Pearce (2):
14087 Reallow git-rebase --interactive --continue if commit is unnecessary
14088 Improve error messages when int/long cannot be parsed from config
14090 Stefan Sperling (1):
14091 Small comment fix for git-cvsimport.
14093 Wincent Colaiuta (1):
14094 Emit helpful status for accidental "git stash" save
14097 Version v1.5.4-rc1; changes since v1.5.4-rc0:
14098 ---------------------------------------------
14100 Andy Whitcroft (1):
14101 git-svn: expand handling of From: and Signed-off-by:
14103 Charles Bailey (1):
14104 Fix git-instaweb breakage on MacOS X due to the limited sed functionality
14106 Christian Couder (1):
14107 git-help: add "help.format" config variable.
14109 David S. Miller (1):
14110 fast-import: fix unalinged allocation and access
14113 git-svn: unlink internal index files after operations
14114 git-svn: handle our top-level path being deleted and later re-added
14115 git-svn: avoid leaving leftover committer/author info in rebase
14116 git-svn: workaround a for broken symlinks in SVN
14117 git-svn: avoid warning when run without arguments
14119 Finn Arne Gangstad (1):
14120 Improved submodule merge support
14122 H.Merijn Brand (1):
14123 the use of 'tr' in the test suite isn't really portable
14125 J. Bruce Fields (8):
14126 whitespace: fix off-by-one error in non-space-in-indent checking
14127 whitespace: reorganize initial-indent check
14128 whitespace: minor cleanup
14129 whitespace: fix initial-indent checking
14130 whitespace: more accurate initial-indent highlighting
14131 whitespace: fix config.txt description of indent-with-non-tab
14132 builtin-apply: minor cleanup of whitespace detection
14133 builtin-apply: stronger indent-with-on-tab fixing
14135 Jakub Narebski (2):
14136 gitweb: disambiguate heads and tags withs the same name
14137 gitweb: Teach "a=blob" action to be more lenient about blob/file mime type
14140 cvsexportcommit: fix massive commits
14141 trim_common_tail: brown paper bag fix.
14142 teach bash completion to treat commands with "--" as a helper
14143 rename git-browse--help to git-help--browse
14144 clone: correctly report http_fetch errors
14145 git-send-email: avoid duplicate message-ids
14146 test "git clone -o"
14149 git-filter-branch.sh: more portable tr usage: use \012, not \n.
14151 Johannes Schindelin (4):
14152 Support config variable diff.external
14153 Document diff.external and mergetool.<tool>.path
14154 rebase -p -i: handle "no changes" gracefully
14155 git show <tag>: show the tagger
14158 threaded pack-objects: Use condition variables for thread communication.
14159 Plug a resource leak in threaded pack-objects code.
14160 Clean up documentation that references deprecated 'git peek-remote'.
14161 filter-branch: Remove broken and unnecessary summary of rewritten refs.
14163 Junio C Hamano (17):
14164 git-commit: squelch needless message during an empty merge
14165 xdl_diff: identify call sites.
14166 xdi_diff: trim common trailing lines
14167 diff --check: minor fixups
14168 xdiff tail trimming: use correct type.
14169 commit: allow --amend to reuse message from another commit
14170 remote: Fix bogus make_branch() call in configuration reader.
14171 Rename git-browse-help helper to git-browse--help
14172 Retire git-runstatus for real.
14173 Start preparing the API documents.
14174 Update draft release notes for 1.5.4
14175 Re-re-re-fix common tail optimization
14176 builtin-commit: fix summary output.
14177 builtin-commit: make summary output consistent with status
14178 Documentation/git-submodule: refer to gitmodules(5)
14179 builtin-blame.c: remove unneeded memclr()
14182 Kristian Høgsberg (1):
14183 Use a strbuf for building up section header and key/value pair strings.
14188 Linus Torvalds (1):
14189 unpack-trees: FLEX_ARRAY fix
14192 clone: fix options '-o' and '--origin' to be recognised again
14195 Fix some more memory leaks in http-push.c
14196 Fix random sha1 in error message in http-fetch and http-push
14197 Remove the default_headers variable from http-push.c
14198 Remove a CURLOPT_HTTPHEADER (un)setting
14199 Avoid redundant declaration of missing_target()
14200 Use strbuf in http code
14201 Fix various memory leaks in http-push.c and http-walker.c
14202 Move fetch_ref from http-push.c and http-walker.c to http.c
14205 provide advance warning of some future pack default changes
14206 fix style of a few comments in diff-delta.c
14207 make 'git describe --all --contains' work
14210 gitweb: Make config_to_multi return [] instead of [undef]
14212 Pierre Habouzit (1):
14213 Fix segfault in diff-delta.c when FLEX_ARRAY is 1
14215 Ralf Wildenhues (1):
14216 Fix some documentation typos.
14219 Clarify error response from 'git fetch' for bad responses
14221 Sean Estabrooks (1):
14222 Fix interactive rebase to preserve author email address
14225 Fix spelling mistakes in user manual
14227 Shawn O. Pearce (2):
14228 Avoid update hook during git-rebase --interactive
14229 Catch and handle git-commit failures in git-rebase --interactive
14231 Wincent Colaiuta (6):
14232 "diff --check" should affect exit status
14233 Unify whitespace checking
14234 Make "diff --check" output match "git apply"
14235 Add tests for "git diff --check" with core.whitespace options
14236 Use shorter error messages for whitespace problems
14237 Test interaction between diff --check and --exit-code
14240 Documentation: describe pack idx v2
14243 Version v1.5.4-rc0; changes since v1.5.3.8:
14244 -------------------------------------------
14247 fix t5403-post-checkout-hook.sh: built-in test in dash does not have "=="
14248 Fix a crash in ls-remote when refspec expands into nothing
14249 More updates and corrections to the russian translation of git-gui
14250 Rework make_usage to print the usage message immediately
14251 Updated russian translation of git-gui
14252 Do no colorify test output if stdout is not a terminal
14253 Add a test checking if send-pack updated local tracking branches correctly
14254 Update the tracking references only if they were succesfully updated on remote
14255 Fix dependencies of parse-options test program
14256 Do not generate full commit log message if it is not going to be used
14257 Simplify crud() in ident.c
14258 Fix git-fast-export for zero-sized blobs
14260 Alexandre Julliard (12):
14261 git.el: Keep the status buffer sorted by filename.
14262 git.el: Allow selecting whether to display uptodate/unknown/ignored files.
14263 git.el: Allow the add and remove commands to be applied to ignored files.
14264 git.el: Preserve file marks when doing a full refresh.
14265 git.el: Do not print a status message on every git command.
14266 git.el: Update a file status in the git buffer upon save.
14267 git.el: Reset the permission flags when changing a file state.
14268 git.el: Fix typo in "Reverted file" message.
14269 git.el: Fix typo in git-update-saved-file error handling.
14270 git.el: Refresh only the changed file marks when marking/unmarking all.
14271 git.el: Run git-gc --auto after commits.
14272 git.el: Added a menu for git-status-mode.
14274 Andreas Ericsson (1):
14275 Simplify strchrnul() compat code
14277 André Goddard Rosa (2):
14278 Print the real filename that we failed to open.
14279 Error out when user doesn't have access permission to the repository
14282 parse_date_format(): convert a format name to an enum date_mode
14283 Make for-each-ref allow atom names like "<name>:<something>"
14284 Make for-each-ref's grab_date() support per-atom formatting
14285 Add a test script for for-each-ref, including test of date formatting
14287 Andy Whitcroft (6):
14288 Teach send-pack a mirror mode
14289 git-push: plumb in --mirror mode
14290 Add tests for git push'es mirror mode
14291 git-push: add documentation for the newly added --mirror mode
14292 git-quiltimport.sh fix --patches handling
14293 git-svn: add support for pulling author from From: and Signed-off-by:
14295 Anton Gyllenberg (1):
14296 gitview: import only one of gtksourceview and gtksourceview2
14298 Ask Bjørn Hansen (1):
14299 send-email: Don't add To: recipients to the Cc: header
14301 Benoit Sigoure (7):
14302 git-svn: add a generic tree traversal to fetch SVN properties
14303 git-svn: implement git svn create-ignore
14304 git-svn: add git svn propget
14305 git-svn: add git svn proplist
14306 git-svn: simplify the handling of fatal errors
14307 core-tutorial: Catch up with current Git
14308 git-svn: sort the options in the --help message.
14310 Björn Steinbrink (1):
14311 git config: Don't rely on regexec() returning 1 on non-match
14313 Blake Ramsdell (1):
14314 transport.c: squelch a gcc 4.0.1 complaint about an uninitialized variable
14317 git-gc: by default use safer "-A" option to repack when not --prune'ing
14318 git-gc --auto: simplify "repack" command line building
14321 Add a --dry-run option to git-send-pack.
14322 Add a --dry-run option to git-push.
14324 Brian Gernhardt (3):
14325 format-patch: Add configuration and off switch for --numbered
14326 format-patch: Test --[no-]numbered and format.numbered
14327 t3502: Disambiguate between file and rev by adding --
14329 Brian M. Carlson (1):
14330 git-gui: Reorder msgfmt command-line arguments
14333 Function for updating refs.
14334 Add tests for documented features of "git reset".
14335 Move make_cache_entry() from merge-recursive.c into read-cache.c
14336 Make "git reset" a builtin.
14337 Make builtin-tag.c use parse_options.
14339 Charles Bailey (1):
14340 Fix clone not to ignore depth when performing a local clone
14343 git-p4 support for perforce renames.
14344 git-p4: Add a helper function to parse the full git diff-tree output.
14345 git-p4: Detect changes to executable bit and include them in p4 submit.
14347 Christian Couder (27):
14348 rev-list --bisect: Move finding bisection into do_find_bisection.
14349 rev-list --bisect: Move some bisection code into best_bisection.
14350 rev-list --bisect: Bisection "distance" clean up.
14351 rev-list --bisect: Fix best == NULL case.
14352 Test suite: reset TERM to its previous value after testing.
14353 rev-list: implement --bisect-all
14354 rev-list documentation: add "--bisect-all".
14355 Bisect: fix some white spaces and empty lines breakages.
14356 Bisect: implement "bisect skip" to mark untestable revisions.
14357 Bisect: refactor "bisect_write_*" functions.
14358 Bisect: refactor some logging into "bisect_write".
14359 Bisect: refactor "bisect_{bad,good,skip}" into "bisect_state".
14360 Bisect: add "bisect skip" to the documentation.
14361 Bisect: add a "bisect replay" test case.
14362 Bisect run: "skip" current commit if script exit code is 125.
14363 Bisect: add "skip" to the short usage string.
14364 Bisect reset: remove bisect refs that may have been packed.
14365 Bisect visualize: use "for-each-ref" to list all good refs.
14366 Bisect: use "$GIT_DIR/BISECT_NAMES" to check if we are bisecting.
14367 Bisect reset: do nothing when not bisecting.
14368 Documentation: add a new man page for "git-help"
14369 Trace and quote with argv: get rid of unneeded count argument.
14370 git-help: add -i|--info option to display info page.
14371 Documentation: describe -i/--info option to "git-help"
14372 git-help: add -w|--web option to display html man page in a browser.
14373 Use {web,instaweb,help}.browser config options.
14374 Documentation: describe -w/--web option to "git-help".
14376 Christian Stimming (14):
14377 Mark strings for translation.
14378 Makefile rules for translation catalog generation and installation.
14379 Add glossary that can be converted into a po file for each language.
14380 Add glossary translation template into git.
14381 German translation for git-gui
14382 German glossary for translation
14383 git-gui: Add more words to translation glossary
14384 git-gui: Update German glossary according to mailing list discussion
14385 git-gui: Incorporate glossary changes into existing German translation
14386 git-gui: Update German translation, including latest glossary changes
14387 git-gui: Add more terms to glossary.
14388 git-gui: Update German translation
14389 Update git-gui.pot with latest (few) string additions and changes.
14390 Update German translation. 100% completed.
14393 Remove outdated references to cogito in documentation
14395 Daniel Barkalow (23):
14396 Refactor http.h USE_CURL_MULTI fill_active_slots().
14397 Make function to refill http queue a callback
14398 Remove obsolete commit-walkers
14399 Modularize commit-walker
14400 Add uploadpack configuration info to remote.
14401 Report information on branches from remote.h
14402 Make fetch-pack a builtin with an internal API
14403 Push code for transport library
14404 Add matching and parsing for fetch-side refspec rules
14405 Add fetch methods to transport library.
14406 Make fetch a builtin
14407 Allow abbreviations in the first refspec to be merged
14408 Fix adding a submodule with a remote url
14409 Restore default verbosity for http fetches.
14410 Remove duplicate ref matches in fetch
14411 Correct handling of upload-pack in builtin-fetch-pack
14412 Miscellaneous const changes and utilities
14413 Build-in peek-remote, using transport infrastructure.
14414 Use built-in send-pack.
14415 Build-in send-pack, with an API for other programs to call.
14417 Use parseopts in builtin-push
14418 Add more checkout tests
14420 David D. Kilzer (8):
14421 git-svn log: fix ascending revision ranges
14422 git-svn log: include commit log for the smallest revision in a range
14423 git-svn log: handle unreachable revisions like "svn log"
14424 git-send-email: show all headers when sending mail
14425 git-svn: extract reusable code into utility functions
14426 git-svn info: implement info command
14427 git-svn: info --url [path]
14428 git-svn: Remove unnecessary Git::SVN::Util package
14431 diff-delta.c: pack the index structure
14432 diff-delta.c: Rationalize culling of hash buckets
14433 git-commit.sh: Shell script cleanup
14436 git-svn: Fix a typo and add a comma in an error message in git-svn
14439 gitweb: Provide title attributes for abbreviated author names.
14440 gitweb: Refactor abbreviation-with-title-attribute code.
14441 gitweb: Use chop_and_escape_str in more places.
14442 Rearrange git-format-patch synopsis to improve clarity.
14443 git-checkout: Support relative paths containing "..".
14444 git-checkout: Test for relative path use.
14445 Mention that git-rm can be an appropriate resolution as well as git-add.
14448 gitweb: the commitdiff is very commonly used, it's needed on search page, too
14450 Dmitry Potapov (1):
14451 preserve executable bits in zip archives
14453 Douglas Stockwell (1):
14454 send-email: Add support for SSL and SMTP-AUTH
14457 Fixed a command line option type for builtin-fsck.c
14458 git-stash: Fix listing stashes
14461 git-svn: support for funky branch and project names over HTTP(S)
14462 git-svn: add tests for command-line usage of init and clone commands
14463 t9106: fix a race condition that caused svn to miss modifications
14464 git-svn: allow `info' command to work offline
14465 git-svn: replace .rev_db with a more space-efficient .rev_map format
14466 git-svn: reinstate old rev_db optimization in new rev_map
14468 Eygene Ryabinkin (2):
14469 git-svn: respect Subversion's [auth] section configuration values
14470 git-svn: use "no warnings 'once'" to disable false-positives
14472 Eyvind Bernhardsen (1):
14473 Fix mis-markup of the -p, --patch option in git-add(1)
14475 Frederick Akalin (1):
14476 gtksourceview2 support for gitview
14479 No longer install git-svnimport, move to contrib/examples
14480 git-reset: add -q option to operate quietly
14481 contrib/hooks/post-receive-email: fix typo
14482 contrib/hooks/post-receive-email: reformat to wrap comments at 76 chars
14483 contrib/hooks/post-receive-email: make subject prefix configurable
14484 hooks--update: fix test for properly set up project description file
14485 hooks--update: decline deleting tags or branches by default, add config options
14486 contrib/hooks/post-receive-email: remove cruft, $committer is not used
14487 Don't cache DESTDIR in perl/perl.mak.
14490 git-cvsimport: fix handling of user name when it is not set in CVSROOT
14493 Remove unreachable statements
14494 Use compat mkdtemp() on Solaris boxes
14496 Gustaf Hendeby (1):
14497 git-svn now reads settings even if called in subdirectory
14499 H.Merijn Brand (1):
14500 Do not rely on the exit status of "unset" for unset variables
14502 Harri Ilari Tapio Liusvaara (1):
14503 git-gui: Disambiguate "commit"
14506 git-clone: honor "--" to end argument parsing
14509 git-gui: initial version of russian translation
14511 J. Bruce Fields (3):
14512 git-rebase: support --whitespace=<option>
14513 git-rebase: fix -C option
14514 errors: "strict subset" -> "ancestor"
14516 Jakub Narebski (18):
14517 gitweb: Fix and simplify "split patch" detection
14518 gitweb: Always set 'from_file' and 'to_file' in parse_difftree_raw_line
14519 gitweb: Add 'status_str' to parse_difftree_raw_line output
14520 gitweb: Remove CGI::Carp::set_programname() call from t9500 gitweb test
14521 gitweb: Easier adding/changing parameters to current URL
14522 gitweb: Use href(-replay=>1, page=>...) to generate pagination links
14523 gitweb: Use href(-replay=>1, action=>...) to generate alternate views
14524 gitweb: Add tests for overriding gitweb config with repo config
14525 gitweb: Read repo config using 'git config -z -l'
14526 gitweb: Use config file for repository description and URLs
14527 gitweb: Style all tables using CSS
14528 gitweb: Put project README in div.readme, fix its padding
14529 autoconf: Add tests for memmem, strtoumax and mkdtemp functions
14530 Add config_int() method to the Git perl module
14531 gitweb: Update and improve gitweb/README file
14532 contrib: Make remotes2config.sh script more robust
14533 autoconf: Add test for OLD_ICONV (squelching compiler warning)
14534 autoconf: Check asciidoc version to automatically set ASCIIDOC8
14537 remote: add 'rm' subcommand
14538 remote: document the 'rm' subcommand
14539 gc: use parse_options
14542 git-remote: exit with non-zero status after detecting error in "rm".
14543 On error, do not list all commands, but point to --help option
14546 contrib/fast-import: add perl version of simple example
14547 diffcore-rename: cache file deltas
14548 git-rebase: document suppression of duplicate commits
14549 send-pack: don't update tracking refs on error
14550 t5516: test update of local refs on push
14551 git-gc: improve wording of --auto notification
14552 Documentation/git-gc: explain --auto in description
14553 Documentation/git-gc: improve description of --auto
14554 more terse push output
14555 receive-pack: don't mention successful updates
14556 send-pack: require --verbose to show update of tracking refs
14557 git-ls-files: add --exclude-standard
14558 send-pack: track errors for each ref
14559 send-pack: check ref->status before updating tracking refs
14560 send-pack: assign remote errors to each ref
14561 make "find_ref_by_name" a public function
14562 send-pack: tighten remote error reporting
14563 send-pack: fix "everything up-to-date" message
14564 avoid "defined but not used" warning for fetch_objs_via_walker
14565 send-pack: cluster ref status reporting
14566 git-tag: test that -s implies an annotated tag
14567 Revert "t5516: test update of local refs on push"
14568 git-commit: clean up die messages
14569 Enable rewrite as well as rename detection in git-status
14570 quote_path: fix collapsing of relative paths
14571 t9600: require cvsps 2.1 to perform tests
14572 t7300: add test for clean with wildcard pathspec
14573 wt-status.c:quote_path(): convert empty path to "./"
14574 add status.relativePaths config variable
14575 git-status: documentation improvements
14576 don't mention index refreshing side effect in git-status docs
14577 Add git-browse-help to .gitignore
14578 Support GIT_PAGER_IN_USE environment variable
14579 git-svn: get color config from --get-colorbool
14580 shortlog: document -e option
14581 git-clone: print an error message when trying to clone empty repo
14583 Jeff Muizelaar (1):
14584 fix contrib/hooks/post-receive-email hooks.recipients error message
14587 hooks-pre-commit: use \t, rather than a literal TAB in regexp
14589 Johannes Schindelin (57):
14592 Teach "git remote" a mirror mode
14593 verify-tag: also grok CR/LFs in the tag signature
14594 apply: get rid of --index-info in favor of --build-fake-ancestor
14595 Move bundle specific stuff into bundle.[ch]
14596 Add bundle transport
14597 git-gui: Deiconify startup wizard so it raises to the top
14598 git-gui: add a simple msgfmt replacement
14599 rebase -i: commit when continuing after "edit"
14600 rebase -i: style fixes and minor cleanups
14601 rebase -i: Fix numbers in progress report
14602 rebase -i: avoid exporting GIT_AUTHOR_* variables
14603 rebase -i: work on a detached HEAD
14604 rebase -i: support single-letter abbreviations for the actions
14605 Introduce remove_dir_recursively()
14606 fetch/push: readd rsync support
14607 Support cvs via git-shell
14608 Fix compilation when NO_CURL is defined
14609 cvsexportcommit: get rid of temporary directory
14610 fetch: if not fetching from default remote, ignore default merge
14611 Deduce exec_path also from calls to git with a relative path
14612 Add tests for parse-options.c
14613 parse-options: Allow abbreviated options when unambiguous
14614 po2msg: ignore entries marked with "fuzzy"
14615 po2msg: ignore untranslated messages
14616 po2msg: actually output statistics
14617 git-reset: do not be confused if there is nothing to reset
14618 Split off the pretty print stuff into its own file
14619 parse-options: abbreviation engine fix.
14620 builtin-reset: do not call "ls-files --unmerged"
14621 builtin-reset: avoid forking "update-index --refresh"
14622 Deprecate git-lost-found
14623 rebase: operate on a detached HEAD
14624 builtin-blame: set up the work_tree before the first file access
14625 rebase: fix "rebase --continue" breakage
14626 Close files opened by lock_file() before unlinking.
14627 rebase -i: move help to end of todo file
14628 launch_editor(): read the file, even when EDITOR=:
14629 builtin-commit: fix reflog message generation
14630 git status: show relative paths when run in a subdirectory
14631 builtin-commit: fix --signoff
14632 builtin-commit --s: add a newline if the last line was not a S-o-b
14633 builtin-commit: resurrect behavior for multiple -m options
14634 builtin-commit: Add newline when showing which commit was created
14635 Replace "runstatus" with "status" in the tests
14636 filter-branch: fix dirty way to provide the helpers to commit filters
14637 git checkout's reflog: even when detaching the HEAD, say from where
14638 bash completion: add diff options
14639 Replace instances of export VAR=VAL with VAR=VAL; export VAR
14640 Teach 'git pull' about --rebase
14641 rebase -i: give rerere a chance
14642 receive-pack: allow deletion of corrupt refs
14643 Add "--expire <time>" option to 'git prune'
14644 Add 'git fast-export', the sister of 'git fast-import'
14645 fast-export: rename the signed tag mode 'ignore' to 'verbatim'
14646 Allow ':/<oneline-prefix>' syntax to work with save_commit_buffer == 0
14648 Johannes Sixt (38):
14649 git-gui: Change main window layout to support wider screens
14650 gitk: Do not pick up file names of "copy from" lines
14651 Change git_connect() to return a struct child_process instead of a pid_t.
14652 Use start_command() in git_connect() instead of explicit fork/exec.
14653 Use start_command() to run content filters instead of explicit fork/exec.
14654 Use run_command() to spawn external diff programs instead of fork/exec.
14655 Use start_comand() in builtin-fetch-pack.c instead of explicit fork/exec.
14656 Have start_command() create a pipe to read the stderr of the child.
14657 upload-pack: Use start_command() to run pack-objects in create_pack_file().
14658 Add infrastructure to run a function asynchronously.
14659 Use the asyncronous function infrastructure in builtin-fetch-pack.c.
14660 upload-pack: Move the revision walker into a separate function.
14661 upload-pack: Run rev-list in an asynchronous function.
14662 t0021-conversion.sh: Test that the clean filter really cleans content.
14663 Avoid a dup2(2) in apply_filter() - start_command() can do it for us.
14664 Use the asyncronous function infrastructure to run the content filter.
14665 Fix an infinite loop in sq_quote_buf().
14666 upload-pack: Use finish_{command,async}() instead of waitpid().
14667 Give git-am back the ability to add Signed-off-by lines.
14668 git-clean: Fix error message if clean.requireForce is not set.
14669 Fix preprocessor logic that determines the availablity of strchrnul().
14670 t5300-pack-object.sh: Split the big verify-pack test into smaller parts.
14671 t7501-commit.sh: Not all seds understand option -i
14672 t5302-pack-index: Skip tests of 64-bit offsets if necessary.
14673 Skip t3902-quoted.sh if the file system does not support funny names.
14674 Use is_absolute_path() in sha1_file.c.
14675 Move #include <sys/select.h> and <sys/ioctl.h> to git-compat-util.h.
14676 builtin run_command: do not exit with -1.
14677 Allow a relative builtin template directory.
14678 Introduce git_etc_gitconfig() that encapsulates access of ETC_GITCONFIG.
14679 Allow ETC_GITCONFIG to be a relative path.
14680 refs.c: Remove unused get_ref_sha1()
14681 fetch-pack: Prepare for a side-band demultiplexer in a thread.
14682 Flush progress message buffer in display().
14683 git-gui: Improve the application icon on Windows.
14684 git-commit: Allow to amend a merge commit that does not change the tree
14685 for-each-ref: Fix quoting style constants.
14686 Fix a typo in checkout.sh and cleanup one-line help messages
14689 Update manpages to reflect new short and long option aliases
14690 Documentation: Fix references to deprecated commands
14692 Jonathan del Strother (2):
14693 Fixing path quoting in git-rebase
14694 gitk: Add support for OS X mouse wheel
14697 Add post-merge hook, related documentation, and tests.
14698 Added example hook script to save/restore permissions/ownership.
14699 post-checkout hook, tests, and docs
14700 Minor usage update in setgitperms.perl
14702 Junio C Hamano (157):
14703 Keep last used delta base in the delta window
14704 git-gui po/README: Guide to translators
14706 Implement git gc --auto
14707 Invoke "git gc --auto" from commit, merge, am and rebase.
14708 archive - leakfix for format_subst()
14709 git-commit: Allow partial commit of file removal.
14710 An additional test for "git-reset -- path"
14712 git-commit: partial commit of paths only removed from the index
14713 Document ls-files --with-tree=<tree-ish>
14714 builtin-pack-objects.c: avoid bogus gcc warnings
14715 stash: implement "stash create"
14716 rebase: allow starting from a dirty tree.
14717 Export matches_pack_name() and fix its return value
14718 pack-objects --keep-unreachable
14719 repack -A -d: use --keep-unreachable when repacking
14720 git-gc --auto: move threshold check to need_to_gc() function.
14721 git-gc --auto: add documentation.
14722 git-gc --auto: protect ourselves from accumulated cruft
14723 git-gc --auto: restructure the way "repack" command line is built.
14724 git-gc --auto: run "repack -A -d -l" as necessary.
14725 builtin-apply.c: fix a tiny leak introduced during xmemdupz() conversion.
14726 builtin-for-each-ref.c::copy_name() - do not overstep the buffer.
14727 git-remote rm: add tests and minor fix-ups
14728 Start RelNotes for 1.5.4
14729 strbuf_setlen(): do not barf on setting length of an empty buffer to 0
14730 send-email --smtp-server-port: allow overriding the default port
14731 rerere: Fix use of an empty strbuf.buf
14732 git-am: make the output quieter.
14733 bundle transport: fix an alloc_ref() call
14734 Update stale documentation link in the k.org site
14735 git-am: fix typo in the previous one.
14736 dateformat: parse %(xxdate) %(yydate:format) correctly
14737 builtin-apply: fix conversion error in strbuf series
14738 Update state documentation link for 1.5.3.4
14739 k.org git toppage: Add link to 1.5.3 release notes.
14740 help: remove extra blank line after "See 'git --help'" message
14741 revert/cherry-pick: work on merge commits as well
14742 git-fetch: do not fail when remote branch disappears
14743 RelNotes-1.5.4: describe recent updates
14744 git-gui: Update Japanese strings (part 2)
14745 Revert "rebase: allow starting from a dirty tree."
14746 git-merge: no reason to use cpio anymore
14747 format-patch -s: add MIME encoding header if signer's name requires so
14748 cherry-pick/revert -m: add tests
14749 test format-patch -s: make sure MIME content type is shown as needed
14750 War on whitespace: first, a bit of retreat.
14751 git-diff: complain about >=8 consecutive spaces in initial indent
14752 core.whitespace: add test for diff whitespace error highlighting
14753 clean: require -f to do damage by default
14754 gc: --prune prunes unreferenced objects.
14755 scripts: Add placeholders for OPTIONS_SPEC
14756 git-rev-parse --parseopt
14757 git-sh-setup: fix parseopt `eval` string underquoting
14758 send-pack: segfault fix on forced push
14759 Style: place opening brace of a function definition at column 1
14760 git-am: -i does not take a string parameter.
14761 Update draft release notes for 1.5.4
14762 Documentation: lost-found is now deprecated.
14763 Make check-docs target detect removed commands
14764 Documentation: remove documentation for removed tools.
14765 git-commit: a bit more tests
14766 Resurrect git-revert.sh example and add comment to builtin-revert.c
14767 core.excludesfile clean-up
14768 Fix per-directory exclude handing for "git add"
14769 git-bisect: war on "sed"
14770 git-bisect: use update-ref to mark good/bad commits
14771 git-bisect: modernize branch shuffling hack
14772 Update draft release notes for 1.5.4
14773 Draft release notes: fix clean.requireForce description
14774 Update draft release notes for 1.5.4
14775 Move gitk to its own subdirectory
14776 git-clean: Fix error message if clean.requireForce is not set.
14777 git-compat-util.h: auto-adjust to compiler support of FLEX_ARRAY a bit better
14778 Fix "quote" misconversion for rewrite diff output.
14779 Make test scripts executable.
14780 file_exists(): dangling symlinks do exist
14781 builtin-commit: do not color status output shown in the message template
14782 builtin-commit: run commit-msg hook with correct message file
14783 Export three helper functions from ls-files
14784 Fix add_files_to_cache() to take pathspec, not user specified list of files
14785 builtin-commit: fix partial-commit support
14786 Addendum to "MaintNotes"
14787 git-add -i: allow multiple selection in patch subcommand
14788 git-branch --contains=commit
14789 git-branch --contains: doc and test
14790 builtin-tag: accept and process multiple -m just like git-commit
14791 Add a few more tests for git-commit
14792 builtin-apply: rename "whitespace" variables and fix styles
14793 t4119: correct overeager war-on-whitespace
14794 builtin-apply: teach whitespace_rules
14795 core.whitespace: documentation updates.
14796 Deprecate peek-remote
14797 Update draft release notes for 1.5.4
14798 builtin-add: fix command line building to call interactive
14799 add -i: Fix running from a subdirectory
14800 "git-tag -s" should create a signed annotated tag
14801 revert/cherry-pick: do not mention the original ref
14802 "color.diff = true" is not "always" anymore.
14803 git-config --get-color: get configured color
14804 dir.c: minor clean-up
14805 per-directory-exclude: lazily read .gitignore files
14806 Update draft release notes for 1.5.4
14807 Resurrect peek-remote
14808 Consolidate command list to one.
14809 Update draft release notes for 1.5.4
14810 rename: Break filepairs with different types.
14811 git-am: catch missing author date early.
14812 Fix --signoff in builtin-commit differently.
14813 git-commit: Allow to amend a merge commit that does not change the tree
14814 git-commit --allow-empty
14815 git-commit --allow-empty
14816 git-commit documentation: fix unfinished sentence.
14817 Add git-fast-export to list of commands.
14818 Update draft release notes for 1.5.4
14819 Run the specified perl in Documentation/
14820 Formatting fix for Documentation/git-help.txt
14821 Documentation: rerere is enabled by default these days.
14822 Documentation/git.txt: typofix
14823 t5510: add a bit more tests for fetch
14824 git-cvsserver runs hooks/post-update
14825 Revert "git-am: catch missing author date early."
14826 Documentation: color.* = true means "auto"
14827 git config --get-colorbool
14828 Color support for "git-add -i"
14829 git-clean: Honor pathspec.
14830 config --get-colorbool: diff.color is a deprecated synonym to color.diff
14831 Use gitattributes to define per-path whitespace rule
14832 hg-to-git: handle an empty dir in hg.
14833 do not discard status in fetch_refs_via_pack()
14834 git-status documentation: mention subdirectory behaviour
14835 Update draft release notes to 1.5.4
14836 git-bisect visualize: work in non-windowed environments better
14837 mailmap: fix bogus for() loop that happened to be safe by accident
14838 shortlog: code restructuring and clean-up
14839 git-shortlog -e: show e-mail address as well
14840 ls-remote: resurrect pattern limit support
14841 Fix commit-msg hook to allow editing
14842 Re-fix "builtin-commit: fix --signoff"
14844 Update draft Release Notes for 1.5.4
14845 Documentation: add gitman.info target
14846 git-help -i: invoke info with document and node name
14847 git-help -i: show info documentation from matching version of git
14848 send-email: do not muck with initial-reply-to when unset.
14849 commit: do not add extra LF at the end of the summary.
14850 Support a merge with conflicting gitlink change
14851 blame: drop blob data after passing blame to the parent
14852 shortlog: default to HEAD when the standard input is a tty
14853 git-diff --numstat -z: make it machine readable
14854 disable t9119 for now.
14855 Documentation: rename git.texi to user-manual.texi
14856 git.spec.in: remove python_path
14857 git-help -w: do not require to be in git repository
14858 RPM spec: Adjust htmldir
14862 git-stash: Display help message if git-stash is run with wrong sub-commands
14865 Updated Russian translation.
14867 Konstantin V. Arkhipov (1):
14868 git-svn's dcommit must use subversion's config
14870 Kristian Høgsberg (18):
14871 Enable wt-status output to a given FILE pointer.
14872 Enable wt-status to run against non-standard index file.
14873 Add strbuf_read_file().
14874 Clean up stripspace a bit, use strbuf even more.
14875 Introduce entry point add_interactive and add_files_to_cache
14876 Export rerere() and launch_editor().
14877 Port builtin-add.c to use the new option parser.
14878 Add testcase for amending and fixing author in git commit.
14879 Export launch_editor() and make it accept ':' as a no-op editor.
14880 Port git commit to C.
14881 builtin-commit: Refresh cache after adding files.
14882 Call refresh_cache() when updating the user index for --only commits.
14883 builtin-commit: Clean up an unused variable and a debug fprintf().
14884 t7501-commit: Add test for git commit <file> with dirty index.
14885 builtin-commit: Include the diff in the commit message when verbose.
14886 Fix off-by-one error when truncating the diff out of the commit message.
14887 Use a strbuf for copying the command line for the reflog.
14888 Rewrite builtin-fetch option parsing to use parse_options().
14890 Kristof Provost (1):
14891 makefile: Add a cscope target
14894 git-svn: add support for --first-parent
14895 git-svn: always use --first-parent
14896 Add test-script for git-merge porcelain
14897 git-merge: fix faulty SQUASH_MSG
14898 git-merge: refactor option parsing
14899 git-merge: add support for branch.<name>.mergeoptions
14900 git-merge: add support for --commit and --no-squash
14901 git-merge: add --ff and --no-ff options
14902 Make merge-recursive honor diff.renamelimit
14903 Teach git-pull about --[no-]ff, --no-squash and --commit
14904 for-each-ref: fix setup of option-parsing for --sort
14907 Speedup scanning for excluded files.
14909 Linus Torvalds (18):
14910 optimize diffcore-delta by sorting hash entries.
14911 Add 'diffcore.h' to LIB_H
14912 Split out "exact content match" phase of rename detection
14913 Ref-count the filespecs used by diffcore
14914 copy vs rename detection: avoid unnecessary O(n*m) loops
14915 Do linear-time/space rename logic for exact renames
14916 Do exact rename detection regardless of rename limits
14917 Fix ugly magic special case in exact rename detection
14918 Do the fuzzy rename detection limits with the exact renames removed
14919 Simplify topo-sort logic
14920 Add "--early-output" log flag for interactive GUI use
14921 Enhance --early-output format
14922 revision walker: mini clean-up
14923 Fix rev-list when showing objects involving submodules
14924 Fix parent rewriting in --early-output
14925 Fix a pathological case in git detecting proper renames
14926 Fix a pathological case in git detecting proper renames
14927 "git tag -u keyname" broken
14930 gitweb: speed up project listing on large work trees by limiting find depth
14932 Marius Storm-Olsen (2):
14933 Add 'git-p4 commit' as an alias for 'git-p4 submit'
14934 Teach core.autocrlf to 'git blame'
14937 git-submodule - allow a relative path as the subproject url
14940 Move convert-objects to contrib.
14941 rebase -i: create .dotest-merge after validating options.
14943 Matthias Kestenholz (1):
14944 Documentation: add --patch option to synopsis of git-add
14946 Michael Gebetsroither (1):
14947 hg-to-git speedup through selectable repack intervals
14949 Michael W. Olson (2):
14950 git-rebase--interactive.sh: Quote arguments to test
14951 Documentation/git-tag.txt: Document how to backdate tags
14953 Michael Witten (2):
14954 git-cvsexportcommit.perl: git-apply no longer needs --binary
14955 git-cvsserver runs hooks/post-receive
14957 Michal Vitecek (1):
14958 Don't use "<unknown>" for placeholders and suppress printing of empty user formats.
14960 Michele Ballabio (7):
14961 git-gui: remove dots in some UI strings
14962 git-gui: add some strings to translation
14963 git-gui: fix typo in lib/blame.tcl
14964 git-gui: update Italian translation
14965 test-lib.sh: move error line after error() declaration
14966 git-gui: fix a typo in lib/commit.tcl
14967 git-gui: update it.po and glossary/it.po
14970 instaweb: allow for use of auto-generated scripts
14971 instaweb: support for Ruby's WEBrick server
14974 Reuse previous annotation when overwriting a tag
14975 Add tests for git tag
14976 Refactor working tree setup
14977 Use setup_work_tree() in builtin-ls-files.c
14978 Don't always require working tree for git-rm
14979 Make git-blame fail when working tree is needed and we're not in one
14980 Small code readability improvement in show_reference() in builtin-tag.c
14981 Do git reset --hard HEAD when using git rebase --skip
14982 Fix and improve t7004 (git-tag tests)
14983 git-send-email.perl: Really add angle brackets to In-Reply-To if necessary
14984 Cleanup variables in http.[ch]
14985 Fix small memory leaks induced by diff_tree_setup_paths
14986 Fix XML parser leaks in http-push
14989 Hungarian translation of git-gui
14990 git-send-email: add a new sendemail.to configuration variable
14991 Include diff options in the git-log manpage
14992 Update Hungarian translation. 100% completed.
14994 Nanako Shiraishi (3):
14995 Japanese translation of git-gui
14996 git-gui: Update Japanese strings
14997 Update ja.po for git-gui
14999 Nguyễn Thái Ngọc Duy (3):
15000 contrib/fast-import: add simple shell example
15001 git-sh-setup.sh: use "git rev-parse --show-cdup" to check for SUBDIRECTORY_OK
15002 Remove repo version check from setup_git_directory
15004 Nicolas Pitre (42):
15005 straighten the list of objects to deltify
15006 localize window memory usage accounting
15007 rearrange delta search progress reporting
15008 basic threaded delta search
15009 threaded delta search: refine work allocation
15010 threaded delta search: better chunck split point
15011 threaded delta search: specify number of threads at run time
15012 fix threaded delta search locking
15013 threaded delta search: add pack.threads config variable
15014 threaded delta search: proper locking for cache accounting
15015 more compact progress display
15016 cope with multiple line breaks within sideband progress messages
15017 pack-objects: no delta possible with only one object in the list
15018 pack-objects.c: fix some global variable abuse and memory leaks
15019 fix const issues with some functions
15020 fix for more minor memory leaks
15021 prune-packed: don't call display_progress() for every file
15022 make struct progress an opaque type
15023 relax usage of the progress API
15024 add throughput to progress display
15025 add throughput display to index-pack
15026 add some copyright notice to the progress display code
15027 add throughput display to git-push
15028 return the prune-packed progress display to the inner loop
15029 make sure throughput display gets updated even if progress doesn't move
15030 Show total transferred as part of throughput progress
15031 make the pack index version configurable
15032 pack-objects: get rid of an ugly cast
15033 git-fetch: more terse fetch output
15034 fix display overlap between remote and local progress
15035 sideband.c: ESC is spelled '\033' not '\e' for portability.
15036 make display of total transferred more accurate
15037 remove dead code from the csum-file interface
15038 restore fetching with thin-pack capability
15039 make display of total transferred fully accurate
15040 nicer display of thin pack completion
15041 add a howto document about corrupted blob recovery
15042 rehabilitate some t5302 tests on 32-bit off_t machines
15043 pack-objects: fix delta cache size accounting
15044 pack-objects: reverse the delta search sort list
15045 pack-objects: fix threaded load balancing
15046 pack-objects: more threaded load balancing fix with often changed paths
15048 Paolo Ciarrocchi (1):
15049 Italian translation of git-gui
15052 git-stash: do not get fooled with "color.diff = true"
15053 Set OLD_ICONV on Cygwin.
15055 Paul Mackerras (37):
15056 gitk: Establish and use global left-to-right ordering for commits
15057 gitk: Improve the drawing of links to parent lines
15058 gitk: Eliminate diagonal arrows
15059 gitk: Get rid of idrowranges and rowrangelist
15060 gitk: Get rid of idinlist array
15061 gitk: Fix some problems with the display of ids as links
15062 gitk: Get rid of the rowchk array
15063 gitk: Do only the parts of the layout that are needed
15064 gitk: Fix bug causing incorrect ref list contents when switching view
15065 gitk: Fix bug causing undefined variable error when cherry-picking
15066 gitk: Add a cache for the topology info
15067 gitk: Make it possible to lay out all the rows we have received so far
15068 gitk: Fix bugs in setting rowfinal
15069 gitk: Get rid of lookingforhead, use commitinterest instead
15070 gitk: Fix bug in generating patches
15071 gitk: Simplify highlighting interface and combine with Find function
15072 gitk: Fix a couple of bugs
15073 gitk: Add progress bars for reading in stuff and for finding
15074 gitk: Fix the tab setting in the diff display window
15075 gitk: Fix bug causing Tcl error when changing find match type
15076 gitk: Use named fonts instead of the font specification
15077 gitk: Keep track of font attributes ourselves instead of using font actual
15078 gitk: Add a font chooser
15079 gitk: Fix bug where the last few commits would sometimes not be visible
15080 gitk: Get rid of the diffopts variable
15081 gitk: Fix Tcl error: can't unset findcurline
15082 gitk: Check that we are running on at least Tcl/Tk 8.4
15083 gitk: Avoid an error when cherry-picking if HEAD has moved on
15084 gitk: Fix "can't unset prevlines(...)" Tcl error
15085 gitk: Limit diff display to listed paths by default
15086 gitk: Ensure tabstop setting gets restored by Cancel button
15087 gitk: Integrate the reset progress bar in the main frame
15088 gitk: Use the status window for other functions
15089 gitk: Fix some bugs with path limiting in the diff display
15090 gitk: Fix a couple more bugs in the path limiting
15091 gitk: Simplify the code for finding commits
15092 gitk: Use the UI font for the diff/old version/new version radio buttons
15094 Pierre Habouzit (80):
15095 Rework strbuf API and semantics.
15096 Simplify strbuf uses in archive-tar.c using strbuf API
15097 fast-import: Use strbuf API, and simplify cmd_data()
15098 mktree: Simplify write_tree() using strbuf API
15099 Use strbuf API in apply, blame, commit-tree and diff
15100 Use strbuf API in buitin-rerere.c
15101 Use strbuf API in cache-tree.c
15102 Strbuf API extensions and fixes.
15103 Change semantics of interpolate to work like snprintf.
15104 Rework pretty_print_commit to use strbufs instead of custom buffers.
15105 Use strbuf_read in builtin-fetch-tool.c.
15106 Use strbufs to in read_message (imap-send.c), custom buffer--.
15107 Replace all read_fd use with strbuf_read, and get rid of it.
15108 New strbuf APIs: splice and attach.
15109 Rewrite convert_to_{git,working_tree} to use strbuf's.
15110 Now that cache.h needs strbuf.h, remove useless includes.
15111 builtin-apply: use strbuf's instead of buffer_desc's.
15112 Refactor replace_encoding_header.
15113 Remove preemptive allocations.
15114 Drop strbuf's 'eof' marker, and make read_line a first class citizen.
15115 fast-import was using dbuf's, replace them with strbuf's.
15116 fast-import optimization:
15117 Add xmemdupz() that duplicates a block of memory, and NUL terminates it.
15118 Use xmemdupz() in many places.
15119 Fix the expansion pattern of the pseudo-static path buffer.
15120 nfv?asprintf are broken without va_copy, workaround them.
15121 strbuf API additions and enhancements.
15122 Rework unquote_c_style to work on a strbuf.
15123 Full rework of quote_c_style and write_name_quoted.
15124 sq_quote_argv and add_to_string rework with strbuf's.
15126 Make builtin-rerere use of strbuf nicer and more efficient.
15127 Small cache_tree_write refactor.
15128 double free in builtin-update-index.c
15129 strbuf change: be sure ->buf is never ever NULL.
15130 strbuf_read_file enhancement, and use it.
15131 Make read_patch_file work on a strbuf.
15132 Fix in-place editing functions in convert.c
15133 Add some fancy colors in the test library when terminal supports it.
15134 Support a --quiet option in the test-suite.
15135 fast-import.c: fix regression due to strbuf conversion
15136 Add a simple option parser.
15137 parse-options: be able to generate usages automatically
15138 parse-options: make some arguments optional, add callbacks.
15139 Add shortcuts for very often used options.
15140 parse-options: allow callbacks to take no arguments at all.
15141 Make builtin-rm.c use parse_options.
15142 Make builtin-mv.c use parse-options
15143 Make builtin-branch.c use parse_options.
15144 Make builtin-describe.c use parse_options
15145 Make builtin-revert.c use parse_options.
15146 Make builtin-update-ref.c use parse_options
15147 Make builtin-symbolic-ref.c use parse_options.
15148 Make builtin-for-each-ref.c use parse-opts.
15149 Make builtin-fsck.c use parse_options.
15150 Make builtin-count-objects.c use parse_options.
15151 Make builtin-name-rev.c use parse_options.
15152 Make builtin-pack-refs.c use parse_options.
15153 git-fetch: be even quieter.
15154 Some better parse-options documentation.
15155 Add a parseopt mode to git-rev-parse to bring parse-options to shell scripts.
15156 Update git-sh-setup(1) to allow transparent use of git-rev-parse --parseopt
15157 Migrate git-clean.sh to use git-rev-parse --parseopt.
15158 Migrate git-clone to use git-rev-parse --parseopt
15159 Migrate git-am.sh to use git-rev-parse --parseopt
15160 Migrate git-merge.sh to use git-rev-parse --parseopt
15161 Migrate git-instaweb.sh to use git-rev-parse --parseopt
15162 Migrate git-checkout.sh to use git-rev-parse --parseopt --keep-dashdash
15163 Migrate git-quiltimport.sh to use git-rev-parse --parseopt
15164 Migrate git-repack.sh to use git-rev-parse --parseopt
15165 sh-setup: don't let eval output to be shell-expanded.
15166 parse-options new features.
15167 Use OPT_SET_INT and OPT_BIT in builtin-branch
15168 Use OPT_BIT in builtin-for-each-ref
15169 Use OPT_BIT in builtin-pack-refs
15170 Make the diff_options bitfields be an unsigned with explicit masks.
15171 Reorder diff_opt_parse options more logically per topics.
15172 parse-options: Allow to hide options from the default usage.
15173 builtin-commit.c: export GIT_INDEX_FILE for launch_editor as well.
15174 Invert numbers and names in the git-shortlog summary mode.
15177 Open external merge tool with original file extensions for all three files
15179 Ralf Wildenhues (10):
15180 manual: Fix or remove em dashes.
15181 Fix some typos, punctuation, missing words, minor markup.
15182 Fix wording in push definition.
15183 manual: Fix example finding commits referencing given content.
15184 manual: add some markup.
15185 manual: use 'URL' instead of 'url'.
15186 git-cherry-pick: improve description of -x.
15187 Fix minor nits in configure.ac
15188 git-bisect.sh: Fix sed script to work with AIX and BSD sed.
15189 Document all help keys in "git add -i" patch mode.
15192 Export format_commit_message()
15193 archive: specfile support (--pretty=format: in archive files)
15194 Remove unused function convert_sha1_file()
15196 archive: specfile syntax change: "$Format:%PLCHLDR$" instead of just "%PLCHLDR" (take 2)
15197 archive: rename attribute specfile to export-subst
15198 archive: fix subst file generation
15199 Correct some sizeof(size_t) != sizeof(unsigned long) typing errors
15201 --pretty=format: on-demand format expansion
15202 --pretty=format: parse commit message only once
15203 add strbuf_adddup()
15204 --format=pretty: avoid calculating expensive expansions twice
15207 Define NO_MEMMEM of FreeBSD as it lacks the function
15209 Robert Schiele (2):
15210 git-gui: install-sh from automake does not like -m755
15211 install-sh from automake does not like -m without delimiting space
15213 Robin Rosenberg (1):
15214 cvsexportcommit: Add switch to specify CVS workdir
15217 git-svn: fix test for trunk svn (commit message not needed)
15218 git-svn: fix test for trunk svn (transaction out of date)
15219 git-svn: handle changed svn command-line syntax
15220 gitk: disable colours when calling git log
15221 Allow HTTP proxy to be overridden in config
15222 Add remote.<name>.proxy
15224 Scott R Parish (7):
15225 "git" returns 1; "git help" and "git help -a" return 0
15226 remove unused/unneeded "pattern" argument of list_commands
15227 "current_exec_path" is a misleading name, use "argv_exec_path"
15228 list_commands(): simplify code by using chdir()
15229 use only the $PATH for exec'ing git commands
15230 include $PATH in generating list of commands for "help -a"
15231 shell should call the new setup_path() to setup $PATH
15233 Sergei Organov (7):
15234 core-tutorial.txt: Fix git-show-branch example and its description
15235 user-manual.txt: fix a few mistakes
15236 user-manual: minor rewording for clarity.
15237 Documentation: customize diff-options depending on particular command
15238 user-manual.txt: minor clarification.
15239 Documentation: fix git-clone manpage not to refer to itself
15240 Let git-help prefer man-pages installed with this version of git
15243 Add more tests for git-clean
15244 Make git-clean a builtin
15245 Teach git clean to use setup_standard_excludes()
15246 Make git status usage say git status instead of git commit
15248 Shawn O. Pearce (106):
15249 git-gui: Locate the library directory early during startup
15250 git-gui: Initialize Tcl's msgcat library for internationalization
15251 git-gui: Update po/README as symlink process is not necessary
15252 git-gui: Correct stock message for 'Invalid font specified in %s'
15253 git-gui: Quiet the msgfmt part of the make process
15254 git-gui: Ensure msgfmt failure stops GNU make
15255 Define NO_MEMMEM on Darwin as it lacks the function
15256 git-gui: Mark revision chooser tooltip for translation
15257 git-gui: Localize commit/author dates when displaying them
15258 git-gui: Support context-sensitive i18n
15259 git-gui: Document the new i18n context support
15260 git-gui: Make the tree browser also use lightgray selection
15261 git-gui: Paper bag fix missing translated strings
15262 Correct builtin-fetch to handle + in refspecs
15263 Fix off by one bug in reflog messages written by builtin-fetch
15264 Remove unnecessary debugging from builtin-fetch
15265 Remove unused unpacklimit variable from builtin-fetch
15266 Replace custom memory growth allocator with ALLOC_GROW
15267 Simplify fetch transport API to just one function
15268 Refactor index-pack "keep $sha1" handling for reuse
15269 Remove pack.keep after ref updates in git-fetch
15270 Always ensure the pack.keep file is removed by git-fetch
15271 Fix builtin-fetch memory corruption by not overstepping array
15272 Backup the array passed to fetch_pack so we can free items
15273 Properly cleanup in http_cleanup so builtin-fetch does not segfault
15274 Don't bother passing ref log details to walker in builtin-fetch
15275 Cleanup duplicate initialization code in transport_get
15276 Add transport.h to LIB_H as transport.o is in LIB_OBJS
15277 Remove unnecessary 'fetch' argument from transport_get API
15278 Allow builtin-fetch to work on a detached HEAD
15279 Don't configure remote "." to fetch everything to itself
15280 Remove more debugging from builtin-fetch
15281 builtin-fetch: Don't segfault on "fetch +foo"
15282 Don't attempt to merge non-existant remotes in t5515
15283 Correct handling of branch.$name.merge in builtin-fetch
15284 Avoid printing unnecessary warnings during fetch and push
15285 Use 'unsigned:1' when we mean boolean options
15286 Rename remote.uri to remote.url within remote handling internals
15287 Refactor struct transport_ops inlined into struct transport
15288 Always obtain fetch-pack arguments from struct fetch_pack_args
15289 Ensure builtin-fetch honors {fetch,transfer}.unpackLimit
15290 Fix memory leaks when disconnecting transport instances
15291 git-gui: Fix missing i18n markup in push/fetch windows
15292 git-gui: Support native Win32 Tcl/Tk under Cygwin
15293 git-gui: Refactor some UI init to occur earlier
15294 git-gui: Allow users to choose/create/clone a repository
15295 git-gui: Avoid console scrollbars unless they are necessary
15296 git-gui: Don't bother showing OS error message about hardlinks
15297 git-gui: Keep the UI responsive while counting objects in clone
15298 git-gui: Copy objects/info/alternates during standard clone
15299 Cleanup style nit of 'x == NULL' in remote.c
15300 Cleanup unnecessary break in remote.c
15301 Prevent send-pack from segfaulting when a branch doesn't match
15302 git-gui: Don't delete console window namespaces too early
15303 git-gui: Don't delete scrollbars in console windows
15304 git-gui: Switch the git-gui logo to Henrik Nyh's logo
15305 git-gui: Make the status bar easier to read in the setup wizard
15306 git-gui: Use Henrik Nyh's git logo icon on Windows systems
15307 git-gui: Support a native Mac OS X application bundle
15308 git-gui: Refer to ourselves as "Git Gui" and not "git-gui"
15309 git-gui: Allow forced push into remote repository
15310 git-gui: Refactor Henrik Nyh's logo into its own procedure
15311 git-gui: Refactor about dialog code into its own module
15312 git-gui: Include our Git logo in the about dialog
15313 git-gui: Use progress meter in the status bar during index updates
15314 git-gui: Consolidate the Fetch and Push menus into a Remote menu
15315 git-gui: Bind Cmd-, to Preferences on Mac OS X
15316 git-gui: Shorten the staged/unstaged changes title bar text
15317 git-gui: Updated po strings based on current sources
15318 git-gui: Move load_config procedure below git-version selection
15319 git-gui: Refactor git-config --list parsing
15320 git-gui: Support LFs embedded in config file values
15321 git-gui: Change repository browser radio buttons to hyperlinks
15322 git-gui: Offer repository management features in menu bar
15323 git-gui: Fix bind errors when switching repository chooser panels
15324 git-gui: Disable the text widget in the repository chooser
15325 git-gui: Bind n/c/o accelerators in repository chooser
15326 git-gui: Ensure copyright message is correctly read as UTF-8
15327 git-gui: Use proper Windows shortcuts instead of bat files
15328 git-gui: Support cloning Cygwin based work-dirs
15329 git-gui: Collapse $env(HOME) to ~/ in recent repositories on Windows
15330 git-gui: Honor a config.mak in git-gui's top level
15331 Fix 'push --all branch...' error handling
15332 Support 'push --dry-run' for rsync transport
15333 Support 'push --dry-run' for http transport
15334 git-gui: Paper bag fix the global config parsing
15335 Change 'Deltifying objects' to 'Compressing objects'
15336 Teach prune-packed to use the standard progress meter
15337 Stop displaying "Pack pack-$ID created." during git-gc
15338 Avoid scary errors about tagged trees/blobs during git-fetch
15339 Define compat version of mkdtemp for systems lacking it
15340 Improved const correctness for strings
15341 Use PRIuMAX instead of 'unsigned long long' in show-index
15342 git-gui: Make sure we get errors from git-update-index
15343 git-gui: Protect against bad translation strings
15344 git-gui: Allow users to set font weights to bold
15345 Reteach builtin-ls-remote to understand remotes
15346 git-gui: Bind Meta-T for "Stage To Commit" menu action
15347 git-fetch: Always fetch tags if the object they reference exists
15348 run-command: Support sending stderr to /dev/null
15349 rev-list: Introduce --quiet to avoid /dev/null redirects
15350 git-fetch: avoid local fetching from alternate (again)
15351 Handle broken vsnprintf implementations in strbuf
15352 Fix warning about bitfield in struct ref
15354 Remove git-status from list of scripts as it is builtin
15356 Shun Kei Leung (1):
15357 git-p4: Fix typo in --detect-labels
15359 Simon Hausmann (10):
15360 git-p4: Always call 'p4 sync ...' before submitting to Perforce.
15361 git-p4: After submission to p4 always synchronize from p4 again (into refs/remotes). Whether to rebase HEAD or not is still left as question to the end-user.
15362 git-p4: Cleanup; moved the code for getting a sorted list of p4 changes for a list of given depot paths into a standalone method.
15363 git-p4: Cleanup; moved the code to import a list of p4 changes using fast-import into a separate member function of P4Sync.
15364 git-p4: Cleanup; Turn self.revision into a function local variable (it's not used anywhere outside the function).
15365 git-p4: Cleanup; moved the code for the initial #head or revision import into a separate function, out of P4Sync.run.
15366 git-p4: Cleanup; moved the (duplicated) code for turning a branch into a git ref (for example foo -> refs/remotes/p4/<project>/foo) into a separate method.
15367 git-p4: Added support for automatically importing newly appearing perforce branches.
15368 git-p4: When skipping a patch as part of "git-p4 submit" make sure we correctly revert to the previous state of the files using "p4 revert".
15369 git-p4: Fix direct import from perforce after fetching changes through git from origin
15372 Make mailsplit and mailinfo strip whitespace from the start of the input
15374 Stefan Sperling (1):
15375 Fix pool handling in git-svnimport to avoid memory leaks.
15377 Steffen Prohaska (16):
15378 git-gui: add directory git-gui is located in to PATH (on Windows)
15379 git-gui: set NO_MSGFMT to force using pure tcl replacement in msysgit
15380 git-gui: add mingw specific startup wrapper
15381 git-gui: offer a list of recent repositories on startup
15382 mergetool: use path to mergetool in config var mergetool.<tool>.path
15383 mergetool: add support for ECMerge
15384 mergetool: avoid misleading message "Resetting to default..."
15385 Fix comment in strbuf.h to use correct name strbuf_avail()
15386 push: mention --verbose option in documentation
15387 push: teach push to pass --verbose option to transport layer
15388 push: support pushing HEAD to real branch name
15389 add refname_match()
15390 push: use same rules as git-rev-parse to resolve refspecs
15391 refactor fetch's ref matching to use refname_match()
15392 Use is_absolute_path() in diff-lib.c, lockfile.c, setup.c, trace.c
15393 sha1_file.c: Fix size_t related printf format warnings
15396 Add a message explaining that automatic GC is about to start
15397 builtin-fetch: Add "-q" as a synonym for "--quiet"
15398 git-svn: Don't create a "master" branch every time rebase is run
15401 Don't checkout the full tree if avoidable
15404 Make the list of common commands more exclusive
15405 Remove hint to use "git help -a"
15407 Thomas Harning (1):
15408 git-merge-ours: make it a builtin.
15410 Uwe Kleine-König (1):
15411 send-email: apply --suppress-from to S-o-b and cc-cmd
15414 git-svn: add a show-externals command.
15417 Added a test for fetching remote tags when there is not tags.
15419 Wincent Colaiuta (21):
15420 Further clarify clean.requireForce changes
15421 Authenticate only once in git-send-email
15422 Refactor patch_update_cmd
15423 Teach builtin-add to pass multiple paths to git-add--interactive
15424 Add path-limiting to git-add--interactive
15425 Add "--patch" option to git-add--interactive
15426 Fix typo in draft 1.5.4 release notes
15427 Highlight keyboard shortcuts in git-add--interactive
15428 revert/cherry-pick: Allow overriding the help text by the calling Porcelain
15429 add -i: allow prefix highlighting for "Add untracked" as well.
15430 git-add -i: add help text for list-and-choose UI
15431 Silence iconv warnings on Leopard
15432 Teach "git add -i" to colorize whitespace errors
15433 Allow --no-verify to bypass commit-msg hook
15434 Documentation: fix --no-verify documentation for "git commit"
15435 Add tests for pre-commit and commit-msg hooks
15436 Interactive editor tests for commit-msg hook
15437 Style fixes for pre-commit hook tests
15438 Use "whitespace" consistently
15439 Documentation: minor grammar fix for "git apply"
15440 Fix "diff --check" whitespace detection
15443 Initial Chinese translation for git-gui
15444 git-gui: Added initial version of po/glossary/zh_cn.po
15447 gitweb: use Perl built-in utf8 function for UTF-8 decoding.
15450 Version v1.5.3.8; changes since v1.5.3.7:
15451 -----------------------------------------
15454 Change from using email.com to example.com as example domain, as per RFC 2606.
15457 git-svn: support for funky branch and project names over HTTP(S)
15458 git-svn: clarify the "Ignoring error from SVN" piece
15461 t9600: test cvsimport from CVS working tree
15462 clone: correctly report http_fetch errors
15463 git-send-email: avoid duplicate message-ids
15466 config.c:store_write_pair(): don't read the byte before a malloc'd buffer.
15468 Junio C Hamano (3):
15469 git grep shows the same hit repeatedly for unmerged paths
15470 git-am -i: report rewritten title
15473 Nguyễn Thái Ngọc Duy (3):
15474 Add missing inside_work_tree setting in setup_git_directory_gently
15475 Do check_repository_format() early
15476 Do check_repository_format() early (re-fix)
15479 Version v1.5.3.7; changes since v1.5.3.6:
15480 -----------------------------------------
15482 Björn Steinbrink (3):
15483 git-commit.sh: Fix usage checks regarding paths given when they do not make sense
15484 t7005-editor.sh: Don't invoke real vi when it is in GIT_EXEC_PATH
15485 git-commit: Add tests for invalid usage of -a/--interactive with paths
15488 config: correct core.loosecompression documentation
15489 config: clarify compression defaults
15491 J. Bruce Fields (7):
15492 git-remote.txt: fix example url
15493 user-manual: mention "..." in "Generating diffs", etc.
15494 Documentation: Fix references to deprecated commands
15495 user-manual: define "branch" and "working tree" at start
15496 user-manual: failed push to public repository
15497 user-manual: clarify language about "modifying" old commits
15498 user-manual: recovering from corruption
15501 Improve description of git-branch -d and -D in man page.
15504 send-email: add transfer encoding header with content-type
15505 Add basic cvsimport tests
15506 cvsimport: use rev-parse to support packed refs
15507 cvsimport: miscellaneous packed-ref fixes
15508 cvsimport: fix usage of cvsimport.module
15510 Johannes Schindelin (2):
15511 bundle create: keep symbolic refs' names instead of resolving them
15512 Replace the word 'update-cache' by 'update-index' everywhere
15515 t7003-filter-branch: Fix test of a failing --msg-filter.
15517 Junio C Hamano (11):
15518 format-patch -s: add MIME encoding header if signer's name requires so
15519 test format-patch -s: make sure MIME content type is shown as needed
15520 ce_match_stat, run_diff_files: use symbolic constants for readability
15521 git-add: make the entry stat-clean after re-adding the same contents
15522 t2200: test more cases of "add -u"
15523 Make test scripts executable.
15524 Fix sample pre-commit hook
15525 git-checkout: describe detached head correctly
15526 scripts: do not get confused with HEAD in work tree
15527 Fix typo in t4008 test title
15530 Linus Torvalds (1):
15531 Fix rev-list when showing objects involving submodules
15534 Doc fix for git-reflog: mention @{...} syntax, and <ref> in synopsys.
15537 Make GIT_INDEX_FILE apply to git-commit
15539 Steffen Prohaska (1):
15540 user-manual: Add section "Why bisecting merge commits can be harder ..."
15543 Version v1.5.3.6; changes since v1.5.3.5:
15544 -----------------------------------------
15547 stop t1400 hiding errors in tests
15549 Ask Bjørn Hansen (1):
15550 When exec() fails include the failing command in the error message
15552 Benoit Sigoure (2):
15553 git-send-email: Change the prompt for the subject of the initial message.
15554 git-svn: prevent dcommitting if the index is dirty.
15557 cvsexportcommit: fix for commits that do not have parents
15559 Christian Couder (1):
15560 for-each-ref: fix off by one read.
15562 David D. Kilzer (2):
15563 RelNotes-1.5.3.5: fix typo
15564 RelNotes-1.5.3.5: fix another typo
15567 Improve accuracy of check for presence of deflateBound.
15570 git-svn: fix dcommit clobbering when committing a series of diffs
15571 git-svn: t9114: verify merge commit message in test
15574 git-diff.txt: add section "output format" describing the diff formats
15575 git-cvsimport: really convert underscores in branch names to dots with -u
15576 git-daemon: fix remote port number in log entry
15577 git-mailsplit: with maildirs not only process cur/, but also new/
15579 Jakub Narebski (1):
15580 gitweb: Update config file example for snapshot feature in gitweb/INSTALL
15583 git-branch: remove mention of non-existent '-b' option
15584 git-send-email: add charset header if we add encoded 'From'
15587 replace reference to git-rm with git-reset in git-commit doc
15589 Johannes Schindelin (1):
15590 Add Documentation/CodingGuidelines
15593 Remove escaping of '|' in manpage option sections
15594 instaweb: Minor cleanups and fixes for potential problems
15595 Documentation: Fix man page breakage with DocBook XSL v1.72
15597 Jonathan del Strother (1):
15598 Fixing path quoting in git-rebase
15600 Junio C Hamano (12):
15601 grep with unmerged index
15602 refresh_index_quietly(): express "optional" nature of index writing better
15603 Makefile: add missing dependency on wt-status.h
15604 Start preparing for 1.5.3.6
15605 t/t3404: fix test for a bogus todo file.
15606 revert/cherry-pick: allow starting from dirty work tree.
15607 git-clean: honor core.excludesfile
15608 core.excludesfile clean-up
15609 Fix per-directory exclude handing for "git add"
15610 Update draft release notes for 1.5.3.6
15611 grep -An -Bm: fix invocation of external grep command
15614 Kristian Høgsberg (1):
15615 Remove unecessary hard-coding of EDITOR=':' VISUAL=':' in some test suites.
15617 Marco Costalba (1):
15618 Remove a couple of duplicated include
15621 Delay pager setup in git blame
15624 print warning/error/fatal messages in one shot
15625 git-hash-object should honor config variables
15626 fix index-pack with packs >4GB containing deltas on 32-bit machines
15628 Ralf Wildenhues (3):
15629 git-clone.txt: Improve --depth description.
15630 Avoid a few unportable, needlessly nested "...`...".
15631 Fix sed string regex escaping in module_name.
15633 Sergei Organov (6):
15634 git-filter-branch.txt: fix a typo.
15635 git-format-patch.txt: fix explanation of an example.
15636 Documentation: quote commit messages consistently.
15637 SubmittingPatches: improve the 'Patch:' section of the checklist
15638 core-tutorial.txt: Fix argument mistake in an example.
15639 git-remote.txt: fix typo
15641 Shawn O. Pearce (2):
15642 Fix memory leak in traverse_commit_list
15643 Don't allow fast-import tree delta chains to exceed maximum depth
15645 Vincent Zanotti (1):
15646 gitweb: correct month in date display for atom feeds
15648 Wincent Colaiuta (2):
15649 Grammar fixes for gitattributes documentation
15650 Fix t9101 test failure caused by Subversion "auto-props"
15653 Version v1.5.3.5; changes since v1.5.3.4:
15654 -----------------------------------------
15657 Ensure we add directories in the correct order
15660 Fix generation of perl/perl.mak
15662 Andrew Clausen (1):
15663 helpful error message when send-pack finds no refs in common.
15665 Aurelien Bompard (1):
15666 honor the http.sslVerify option in shell scripts
15668 Benoit Sigoure (1):
15669 Fix a small memory leak in builtin-add
15671 Björn Steinbrink (3):
15672 Fix --strategy parsing in git-rebase--interactive.sh
15673 git-rebase--interactive.sh: Don't pass a strategy to git-cherry-pick.
15674 git-rebase--interactive.sh: Make 3-way merge strategies work for -p.
15676 Brian Gernhardt (1):
15677 cvsserver: Use exit 1 instead of die when req_Root fails.
15679 Frank Lichtenheld (1):
15680 git-config: don't silently ignore options after --list
15683 git-config: handle --file option with relative pathname properly
15684 git-config: print error message if the config file cannot be read
15686 Jean-Luc Herren (2):
15687 git add -i: Fix parsing of abbreviated hunk headers
15688 git add -i: Remove unused variables
15691 send-pack: respect '+' on wildcard refspecs
15693 Joakim Tjernlund (1):
15694 Improve receive-pack error message about funny ref creation
15696 Johannes Schindelin (5):
15697 clear_commit_marks(): avoid deep recursion
15698 rebase -i: use diff plumbing instead of porcelain
15699 Fix setup_git_directory_gently() with relative GIT_DIR & GIT_WORK_TREE
15700 fix filter-branch documentation
15701 filter-branch: update current branch when rewritten
15703 Julian Phillips (1):
15704 fast-import: Fix argument order to die in file_change_m
15706 Junio C Hamano (8):
15707 git-remote: fix "Use of uninitialized value in string ne"
15708 sha1_file.c: avoid gcc signed overflow warnings
15709 merge-recursive.c: mrtree in merge() is not used before set
15710 RelNotes-1.5.3.5: describe recent fixes
15711 Prevent send-pack from segfaulting (backport from 'master')
15712 git-merge: document but discourage the historical syntax
15713 Update GIT 1.5.3.5 Release Notes
15717 Make merge-recursive honor diff.renamelimit
15719 Linus Torvalds (6):
15720 Fix embarrassing "git log --follow" bug
15721 Clean up "git log" format with DIFF_FORMAT_NO_OUTPUT
15722 git-blame shouldn't crash if run in an unmerged tree
15723 Avoid scary errors about tagged trees/blobs during git-fetch
15724 Fix directory scanner to correctly ignore files without d_type
15725 Fix diffcore-break total breakage
15727 Mathias Megyei (1):
15728 Do not remove distributed configure script
15730 Michael W. Olson (1):
15731 Documentation/git-cvsexportcommit.txt: s/mgs/msg/ in example
15733 Michele Ballabio (2):
15734 git-reflog: document --verbose
15735 git-archive: document --exec
15738 cherry-pick/revert: more compact user direction message
15740 Patrick Welche (1):
15741 Define NI_MAXSERV if not defined by operating system
15743 Ralf Wildenhues (1):
15744 gitk.txt: Fix markup.
15746 Robert Schiele (1):
15747 fixing output of non-fast-forward output of post-receive-email
15749 Sergei Organov (1):
15750 core-tutorial: Use new syntax for git-merge.
15752 Shawn O. Pearce (17):
15753 git-gui: Display message box when we cannot find git in $PATH
15754 git-gui: Handle starting on mapped shares under Cygwin
15755 git-gui: Ensure .git/info/exclude is honored in Cygwin workdirs
15756 git-gui: Allow gitk to be started on Cygwin with native Tcl/Tk
15757 git-gui: Don't crash when starting gitk from a browser session
15758 Whip post 1.5.3.4 maintenance series into shape.
15759 Correct typos in release notes for 1.5.3.5
15760 Avoid 'expr index' on Mac OS X as it isn't supported
15761 Document additional 1.5.3.5 fixes in release notes
15762 Yet more 1.5.3.5 fixes mentioned in release notes
15763 Avoid invoking diff drivers during git-stash
15764 Further 1.5.3.5 fixes described in release notes
15765 Paper bag fix diff invocation in 'git stash show'
15766 git-gui: Correctly report failures from git-write-tree
15767 git-gui: Handle progress bars from newer gits
15768 git-gui: Don't display CR within console windows
15769 Describe more 1.5.3.5 fixes in release notes
15772 git-gui: Avoid using bold text in entire gui for some fonts
15774 Steffen Prohaska (2):
15775 git-gui: accept versions containing text annotations, like 1.5.3.mingw.1
15776 attr: fix segfault in gitattributes parsing code
15779 Version v1.5.3.4; changes since v1.5.3.3:
15780 -----------------------------------------
15783 post-receive-hook: Remove the From field from the generated email header so that the pusher's name is used
15786 Add test case for ls-files --with-tree
15788 Federico Mena Quintero (4):
15789 Say when --track is useful in the git-checkout docs.
15790 Add documentation for --track and --no-track to the git-branch docs.
15791 Note that git-branch will not automatically checkout the new branch
15792 Make git-pull complain and give advice when there is nothing to merge with
15795 git-remote: exit with non-zero status after detecting errors.
15797 Jean-Luc Herren (2):
15798 git-add--interactive: Allow Ctrl-D to exit
15799 git-add--interactive: Improve behavior on bogus input
15802 diffcore-rename: cache file deltas
15805 Mention 'cpio' dependency in INSTALL
15807 Johannes Schindelin (2):
15808 rebase -i: squash should retain the authorship of the _first_ commit
15809 Fix typo in config.txt
15811 Junio C Hamano (5):
15812 Whip post 1.5.3.3 maintenance series into shape.
15813 git-commit: initialize TMP_INDEX just to be sure.
15814 for-each-ref: fix %(numparent) and %(parent)
15815 rename diff_free_filespec_data_large() to diff_free_filespec_blob()
15819 Must not modify the_index.cache as it may be passed to realloc at some point.
15822 git stash: document apply's --index switch
15824 Robert Schiele (1):
15825 the ar tool is called gar on some systems
15827 Steffen Prohaska (1):
15828 fixed link in documentation of diff-options
15831 Version v1.5.3.3; changes since v1.5.3.2:
15832 -----------------------------------------
15835 Move make_cache_entry() from merge-recursive.c into read-cache.c
15838 quiltimport: Skip non-existent patches
15841 Detect exec bit in more cases.
15844 Supplant the "while case ... break ;; esac" idiom
15847 git-svn: don't attempt to spawn pager if we don't want one
15850 Fixed minor typo in t/t9001-send-email.sh test command line.
15852 J. Bruce Fields (1):
15853 user-manual: don't assume refs are stored under .git/refs
15855 Jakub Narebski (2):
15856 gitweb: Remove parse_from_to_diffinfo code from git_patchset_body
15857 gitweb: No difftree output for trivial merge
15860 unexpected Make output (e.g. from --debug) causes build failure
15861 Do not over-quote the -f envelopesender value.
15863 Johannes Schindelin (1):
15864 apply: get rid of --index-info in favor of --build-fake-ancestor
15867 gitattributes.txt: Remove a duplicated paragraph about 'ident' and 'crlf' interaction.
15868 gitattributes.txt: Be more to the point in the filter driver description.
15870 Junio C Hamano (3):
15871 Documentation/git-lost-found.txt: drop unnecessarily duplicated name.
15872 Mergetool generating blank files (1.5.3)
15875 Linus Torvalds (1):
15876 Fix revision log diff setup, avoid unnecessary diff generation
15879 Move the paragraph specifying where the .idx and .pack files should be
15880 Conjugate "search" correctly in the git-prune-packed man page.
15883 user-manual: Explain what submodules are good for.
15886 User Manual: add a chapter for submodules
15887 git-bundle: fix commandline examples in the manpage
15890 core-tutorial: correct URL
15893 Fix spelling of overridden in documentation
15896 mergetool: fix emerge when running in a subdirectory
15897 mergetool: Fix typo in options passed to kdiff3
15900 Version v1.5.3.2; changes since v1.5.3.1:
15901 -----------------------------------------
15903 Alexandre Julliard (1):
15904 hooks--update: Explicitly check for all zeros for a deleted ref.
15906 Benoit Sigoure (1):
15907 Add test to check recent fix to "git add -u"
15910 git-tag -s must fail if gpg cannot sign the tag.
15913 git-send-email.perl: Add angle brackets to In-Reply-To if necessary
15915 Dmitry V. Levin (2):
15916 Makefile: Add cache-tree.h to the headers list
15917 git-commit: Disallow amend if it is going to produce an empty non-merge commit
15920 git-svn: fix "Malformed network data" with svn:// servers
15921 git-svn: understand grafts when doing dcommit
15922 Documentation/git-svn: updated design philosophy notes
15925 git-gui: lib/index.tcl: handle files with % in the filename properly
15926 git-clone: improve error message if curl program is missing or not executable
15928 J. Bruce Fields (13):
15929 user-manual: adjust section levels in "git internals"
15930 user-manual: move object format details to hacking-git chapter
15931 user-manual: rename "git internals" to "git concepts"
15932 user-manual: create new "low-level git operations" chapter
15933 user-manual: rewrite index discussion
15934 user-manual: reorder commit, blob, tree discussion
15935 user-manual: rewrite object database discussion
15936 user-manual: move packfile and dangling object discussion
15937 user-manual: fix introduction to packfiles
15938 user-manual: todo updates and cleanup
15939 documentation: replace Discussion section by link to user-manual chapter
15940 core-tutorial: minor cleanup
15941 git-apply: fix whitespace stripping
15944 Documentation/git-archive.txt: a couple of clarifications.
15946 Jean-Luc Herren (1):
15947 stash: end index commit log with a newline
15950 git-push: documentation and tests for pushing only branches
15952 Johannes Schindelin (2):
15953 revision walker: --cherry-pick is a limited operation
15954 apply --index-info: fall back to current index for mode changes
15956 Junio C Hamano (13):
15957 git-apply: do not read past the end of buffer
15958 git-add -u: do not barf on type changes
15959 git-format-patch --in-reply-to: accept <message@id> with angle brackets
15960 diff --no-index: do not forget to run diff_setup_done()
15961 Documentation/git-config.txt: AsciiDoc tweak to avoid leading dot
15962 Split grep arguments in a way that does not requires to add /dev/null.
15963 git-sh-setup: typofix in comments
15964 send-email: make message-id generation a bit more robust
15965 git-commit: Allow partial commit of file removal.
15966 git-commit: partial commit of paths only removed from the index
15967 Document ls-files --with-tree=<tree-ish>
15968 t/t4014: test "am -3" with mode-only change.
15971 Linus Torvalds (1):
15972 Fix the rename detection limit checking
15974 Matthias Urlichs (1):
15975 git-svnimport: Use separate arguments in the pipe for git-rev-parse
15978 (cvs|svn)import: Ask git-tag to overwrite old tags.
15980 Michele Ballabio (2):
15981 git-gui: show unstaged symlinks in diff viewer
15982 git-gui: handle "deleted symlink" diff marker
15985 Documentation / grammer nit
15988 fix doc for --compression argument to pack-objects
15990 Pierre Habouzit (1):
15991 Fix lapsus in builtin-apply.c
15993 Ramsay Allan Jones (1):
15994 Fix a test failure (t9500-*.sh) on cygwin
15996 Shawn O. Pearce (17):
15997 git-gui: Correct starting of git-remote to handle -w option
15998 git-gui: Fix detaching current branch during checkout
15999 git-gui: Properly set the state of "Stage/Unstage Hunk" action
16000 Don't allow contrib/workdir/git-new-workdir to trash existing dirs
16001 Cleanup unnecessary file modifications in t1400-update-ref
16002 Include a git-push example for creating a remote branch
16003 git-gui: Disable Tk send in all git-gui sessions
16004 git-gui: Avoid use of libdir in Makefile
16005 git-gui: Assume untracked directories are Git submodules
16006 git-gui: Trim trailing slashes from untracked submodule names
16007 Make --no-thin the default in git-push to save server resources
16008 git-gui: Don't delete send on Windows as it doesn't exist
16009 git-gui: Make backporting changes from i18n version easier
16010 git-gui: Font chooser to handle a large number of font families
16011 git-gui: Provide 'uninstall' Makefile target to undo an installation
16012 git-gui: Paper bag fix "Commit->Revert" format arguments
16013 git-gui: Disable native platform text selection in "lists"
16015 Sven Verdoolaege (1):
16016 git-diff: don't squelch the new SHA1 in submodule diffs
16018 Ulrik Sverdrup (1):
16019 Remove duplicate note about removing commits with git-filter-branch
16022 Fixed update-hook example allow-users format.
16025 Version v1.5.3.1; changes since v1.5.3:
16026 ---------------------------------------
16028 Junio C Hamano (2):
16029 Typofix: 1.5.3 release notes
16030 GIT 1.5.3.1: obsolete git-p4 in RPM spec file.
16033 Version v1.5.3; changes since v1.5.3-rc7:
16034 -----------------------------------------
16037 Temporary fix for stack smashing in mailinfo
16040 git-tag: Fix -l option to use better shell style globs.
16043 git-svn: fix dcommit clobbering upstream when committing multiple changes
16045 Giuseppe Bilotta (2):
16046 git-filter-branch: more detailed USAGE
16047 git-filter-branch: document --original option
16050 git-send-email --cc-cmd
16052 Johannes Schindelin (5):
16053 completion: also complete git-log's --left-right and --cherry-pick option
16054 filter-branch: fix remnants of old syntax in documentation
16055 rebase -i: mention the option to split commits in the man page
16056 filter-branch: provide the convenience functions also for commit filters
16057 filter-branch: introduce convenience function "skip_commit"
16060 rebase -m: Fix incorrect short-logs of already applied commits.
16062 Junio C Hamano (13):
16063 git-daemon(1): assorted improvements.
16064 ls-files --error-unmatch: do not barf if the same pattern is given twice.
16065 Makefile: do not allow gnu make to remove test-*.o files
16066 filter-branch: make sure orig_namespace ends with a single slash.
16067 git-init: autodetect core.symlinks
16068 Make "git-log --" without paths behave the same as "git-log" without --
16069 Hopefully the final update to draft release notes for 1.5.3.
16070 git-svn: Protect against "diff.color = true".
16071 git-diff: resurrect the traditional empty "diff --git" behaviour
16072 Avoid one-or-more (\+) non BRE in sed scripts.
16073 Documentation: minor AsciiDoc mark-up fixes.
16074 Update my contact address as the maintainer.
16078 URL: allow port specification in ssh:// URLs
16081 Make git-archimport log entries more consistent
16084 fix same sized delta logic
16086 Paul Mackerras (1):
16087 gitk: Fix bug causing undefined variable error when cherry-picking
16089 Robin Rosenberg (1):
16090 Mention -m as an abbreviation for --merge
16092 Shawn O. Pearce (1):
16093 Teach bash about completing arguments for git-tag
16096 Fixing comment in merge strategies
16099 Version v1.5.3-rc7; changes since v1.5.3-rc6:
16100 ---------------------------------------------
16103 Fix git-remote for ActiveState Perl
16105 Alexandre Julliard (1):
16106 git.el: Avoid a lisp error when there's no current branch (detached HEAD).
16109 Documentation: For consistency, use CVS instead of cvs.
16110 Documentation: Correct various misspellings and typos.
16111 Make usage documentation for git-am consistent.
16112 Make usage documentation for git-add consistent.
16113 When nothing to git-commit, honor the git-status color setting.
16116 diff-delta.c: Fix broken skip calculation.
16117 Documentation/user-manual.txt: fix a few omissions of gitlink commands.
16118 Documentation/user-manual.txt: fix a few omissions of gitlink commands.
16119 git-svn.txt: fix an obvious misspelling.
16122 git.el: Added colors for dark background
16125 git-svn: update documentation with CAVEATS section
16126 git-svn: dcommit prints out the URL to be committed to
16128 J. Bruce Fields (5):
16129 user-manual: edit "ignoring files" for conciseness
16130 user-manual: minor editing for conciseness
16131 user-manual: introduce the word "commit" earlier
16132 user-manual: use pithier example commit
16133 user-manual: fix incorrect header level
16135 Jakub Narebski (1):
16136 gitweb: Fix escaping HTML of project owner in 'projects_list' and 'summary' views
16139 git-tag(1): Remove duplicate text
16141 Johannes Schindelin (2):
16142 rebase -i: fix squashing corner case
16143 name-rev: Fix non-shortest description
16145 Junio C Hamano (11):
16146 blame: check return value from read_sha1_file()
16147 pack-objects: check return value from read_sha1_file()
16148 RelNotes draft for 1.5.3 update.
16149 Fix initialization of a bare repository
16150 git --bare cmd: do not unconditionally nuke GIT_DIR
16151 git-merge: do up-to-date check also for all strategies
16152 Porcelain level "log" family should recurse when diffing.
16153 "format-patch --root rev" is the way to show everything.
16154 Documentation/git-diff: A..B and A...B cannot take tree-ishes
16155 format-patch documentation: reword to hint "--root <one-commit>" more clearly
16158 Linus Torvalds (1):
16159 Fix racy-git handling in git-write-tree.
16162 Describe two-dot and three-dot notation for diff endpoints.
16165 gitweb: Fix searchbox positioning
16166 gitweb: Lift any characters restriction on searched strings
16167 git-add: Make the "tried to add ignored file" error message less confusing
16168 git-add: Make the filename globbing note a bit clearer
16171 Fix breakage in git-rev-list.txt
16174 Documentation: update tar.umask default
16176 Sean Estabrooks (1):
16177 Reset terminal attributes when terminating git send-email
16179 Shawn O. Pearce (13):
16180 git-gui: Fix window manager problems on ion3
16181 git-gui: Allow git-merge to use branch names in conflict markers
16182 git-gui: Paper bag fix "Stage Hunk For Commit" in diff context menu
16183 git-gui: Fix "unoptimized loading" to not cause git-gui to crash
16184 Fix new-workdir (again) to work on bare repositories
16185 Suggest unsetting core.bare when using new-workdir on a bare repository
16186 Update bash completion with new 1.5.3 command line options
16187 Teach bash to complete ref arguments to git-describe
16188 Teach bash about git-submodule and its subcommands
16189 git-gui: Refactor diff pane popup support for future improvements
16190 git-gui: Do not offer to stage three-way diff hunks into the index
16191 git-gui: Correct 'git gui blame' in a subdirectory
16192 Don't segfault if we failed to inflate a packed delta
16194 Simon Hausmann (2):
16195 git-p4: Make 'git-p4 branches' work after an initial clone with git clone from an origin-updated repository.
16196 git-p4: Fix warnings about non-existant refs/remotes/p4/HEAD ref when running git-p4 sync the first time after a git clone.
16198 Stefan Sperling (1):
16199 Document -u option in git-svnimport man page
16201 martin f. krafft (2):
16202 git-svn init/clone --stdlayout option to default-init trunk/tags/branches
16203 Install man3 manpages to $PREFIX/share/man/man3 even for site installs
16206 Version v1.5.3-rc6; changes since v1.5.3-rc5:
16207 ---------------------------------------------
16210 Fix whitespace in "Format of STDIN stream" of fast-import
16211 Avoid using va_copy in fast-import: it seems to be unportable.
16213 Arjen Laarhoven (2):
16214 gitk: Make the date/time display configurable
16215 t1301-shared-repo.sh: fix 'stat' portability issue
16218 Clarify actual behavior of 'git add' and ignored files
16220 Brian Gernhardt (1):
16221 Minor clarifications to git-filter-branch usage and doc
16224 Fix misspelling of 'suppress' in docs
16227 git-svn: fix log with single revision against a non-HEAD branch
16230 gitk: Handle 'copy from' and 'copy to' in diff headers.
16232 Junio C Hamano (10):
16233 Fix "git add -u" data corruption.
16235 Fix read-tree merging more than 3 trees using 3-way merge
16236 Update documentation links for older releases.
16237 git-clone: allow --bare clone
16238 Documentation/git-rebase: fix an example
16239 Clean-up read-tree error condition.
16240 fast-import pull request
16241 git clone: do not issue warning while cloning locally across filesystems
16245 git-submodule: re-enable 'status' as the default subcommand
16247 Linus Torvalds (2):
16248 Make thin-pack generation subproject aware.
16249 Take binary diffs into account for "git rebase"
16251 Lukas Sandström (1):
16252 Add the word reflog to Documentation/config.txt:core.logAllRefUpdates
16255 git-completion.bash - add support for git-bundle
16258 Add and document a global --no-pager option for git.
16261 Clarify commit-tree documentation
16264 pack-objects: remove bogus arguments to delta_cacheable()
16266 Paul Mackerras (3):
16267 gitk: Fix warning when removing a branch
16268 gitk: Fix bug in fix for warning when removing a branch
16269 gitk: Add a window to list branches, tags and other references
16272 path-list.c: always free strdup'ed paths
16274 Salikh Zakirov (1):
16275 git-add -u paths... now works from subdirectory
16277 Sean Estabrooks (1):
16278 Fix small typo in git send-email man page.
16280 Shawn O. Pearce (11):
16281 git-gui: Avoid Tcl error in popup menu on diff viewer
16282 Actually allow TAG_FIXUP branches in fast-import
16283 Use handy ALLOC_GROW macro in fast-import when possible
16284 Teach fast-import to ignore lines starting with '#'
16285 Make trailing LF following fast-import `data` commands optional
16286 Make trailing LF optional for all fast-import commands
16287 Allow frontends to bidirectionally communicate with fast-import
16288 Generate crash reports on die in fast-import
16289 Include recent command history in fast-import crash reports
16290 Correct documentation of 'reflog show' to explain it shows HEAD
16291 Don't allow combination of -g and --reverse as it doesn't work
16293 Steffen Prohaska (1):
16294 gitk: Let user easily specify lines of context in diff view
16297 Document what the stage numbers in the :$n:path syntax mean.
16299 Sven Verdoolaege (1):
16300 git-apply: apply submodule changes
16303 git-gui: Added support for OS X right click
16306 Version v1.5.3-rc5; changes since v1.5.3-rc4:
16307 ---------------------------------------------
16310 Documentation/git-svn: how to clone a git-svn-created repository
16312 Alberto Bertogli (1):
16313 Allow git-svnimport to take "" as the trunk directory.
16316 Fix filehandle leak in "git branch -D"
16317 gitk: Continue and show error message in new repos
16318 gitk: Show an error and exit if no .git could be found
16320 Alexandre Julliard (3):
16321 git.el: Add support for interactive diffs.
16322 git.el: Always set the current directory in the git-diff buffer.
16323 git-add: Add support for --refresh option.
16326 cvsserver: Fix for work trees
16327 Add read_cache to builtin-check-attr
16329 Brian Gernhardt (1):
16330 Fix t5701-clone-local for white space from wc
16333 Make git tag a builtin.
16334 builtin-tag.c: Fix two memory leaks and minor notation changes.
16335 Make verify-tag a builtin.
16338 Documentation/git-commit.txt: correct bad list formatting.
16339 Add support for an info version of the user manual
16340 INSTALL: explain info installation and dependencies.
16341 Documentation/Makefile: remove cmd-list.made before redirecting to it.
16342 git-sh-setup.sh: make GIT_DIR absolute
16343 Add a test for git-commit being confused by relative GIT_DIR
16346 git-am: initialize variable $resume on startup
16348 J. Bruce Fields (4):
16349 user-manual: update for new default --track behavior
16350 user-manual: mention git-gui
16351 documentation: use the word "index" in the git-add manual page
16352 documentation: use the word "index" in the git-commit man page
16354 Jakub Narebski (1):
16355 gitweb: Fix handling of $file_name in feed generation
16357 Johannes Schindelin (4):
16358 launch_editor(): Heed GIT_EDITOR and core.editor settings
16359 Teach "git stripspace" the --strip-comments option
16360 checkout-index needs a working tree
16361 Reinstate the old behaviour when GIT_DIR is set and GIT_WORK_TREE is unset
16363 Junio C Hamano (24):
16364 git-clone: aggressively optimize local clone behaviour.
16365 git-completion: add "git stash"
16366 INSTALL: add warning on docbook-xsl 1.72 and 1.73
16367 unpack-trees.c: assume submodules are clean during check-out
16368 Fix install-doc-quick target
16369 user-manual: mention git stash
16370 setup.c:verify_non_filename(): don't die unnecessarily while disambiguating
16371 pager: find out pager setting from configuration
16372 Fix "make GZ=1 quick-install-doc"
16373 Reorder the list of commands in the manual.
16374 Fix formatting of git-blame documentation.
16375 Fix an illustration in git-rev-parse.txt
16376 tweak manpage formatting
16377 Revert "tweak manpage formatting"
16378 Optimize "diff --cached" performance.
16379 allow git-bundle to create bottomless bundle
16380 allow git-bundle to create bottomless bundle
16381 t3404: fix "fake-editor"
16382 builtin-bundle create - use lock_file
16383 git-diff: squelch "empty" diffs
16384 merge-recursive: do not rudely die on binary merge
16385 attr.c: refactoring
16386 attr.c: read .gitattributes from index as well.
16389 Jyotirmoy Bhattacharya (1):
16390 Fixed git-push manpage
16392 Linus Torvalds (8):
16393 connect: accept file:// URL scheme
16394 apply: remove directory that becomes empty by renaming the last file away
16395 Start moving unpack-trees to "struct tree_desc"
16396 Fix "git commit directory/" performance anomaly
16397 Move old index entry removal from "unpack_trees()" into the individual functions
16398 Optimize the common cases of git-read-tree
16399 Optimize the two-way merge of git-read-tree too
16400 Optimize the three-way merge of git-read-tree
16402 Luiz Fernando N. Capitulino (3):
16403 Avoid ambiguous error message if pack.idx header is wrong
16404 Introduces xmkstemp()
16405 Use xmkstemp() instead of mkstemp()
16407 Marco Costalba (1):
16408 Add --log-size to git log to print message size
16411 builtin-bundle.c - use stream buffered input for rev-list
16412 builtin-bundle - use buffered reads for bundle header
16413 gitk: Enable selected patch text on Windows
16414 gitk: Handle MouseWheel events on Windows
16415 t3902 - skip test if file system doesn't support HT in names
16417 Paul Mackerras (4):
16418 gitk: Add a context menu for file list entries
16419 gitk: Fix bug causing the "can't unset idinlist(...)" error
16420 gitk: Fix bug introduced in commit 67a4f1a7
16421 gitk: Fix bug causing Tcl error when updating graph
16423 Randal L. Schwartz (1):
16424 add "test-absolute-path" to .gitignore
16427 git-p4: Fix the sorting of changelists when cloning a Perforce repository.
16430 diff: don't run pager if user asked for a diff style exit code
16431 diff: squelch empty diffs even more
16433 Shawn O. Pearce (4):
16434 Document GIT_SSH environment variable alongside other variables
16435 Teach update-paranoid how to store ACLs organized by groups
16436 Teach the update-paranoid to look at file differences
16437 Use the empty tree for base diff in paranoid-update on new branches
16439 Simon Hausmann (2):
16440 git-p4: Fix support for symlinks.
16441 git-p4: Fix git-p4 submit to include only changed files in the perforce submit template.
16443 Steffen Prohaska (1):
16444 Improved hint on how to set identity
16447 git-stash documentation: stash numbering starts at zero, not one
16448 git-stash documentation: add missing backtick
16451 Add a note about the index being updated by git-status in some cases
16453 Uwe Kleine-König (3):
16454 send-email: teach sanitize_address to do rfc2047 quoting
16455 send-email: rfc822 forbids using <address@domain> without a non-empty "phrase"
16456 send-email: get all the quoting of realnames right
16459 Version v1.5.3-rc4; changes since v1.5.3-rc3:
16460 ---------------------------------------------
16463 Add an option to specify a file to config builtin
16464 Add a test for git-config --file
16465 Make verse of git-config manpage more readable
16466 Hack git-add--interactive to make it work with ActiveState Perl
16468 Alexandre Julliard (2):
16469 git.el: Avoid using ewoc-set-data for compatibility with Emacs 21.
16470 git.el: Take into account the core.excludesfile config option.
16472 Bradford C. Smith (2):
16473 fully resolve symlinks when creating lockfiles
16474 use lockfile.c routines in git_commit_set_multivar()
16476 Brian Gernhardt (1):
16477 Document commit.template configuration variable.
16479 Christian Couder (1):
16480 rev-list --bisect: fix allocation of "int*" instead of "int".
16482 Christian Stimming (1):
16483 git-gui: Unify wording to say "to stage" instead of "to add"
16486 Makefile: use $(FIND) instead of find
16487 git-sh-setup.sh: make GIT_EDITOR/core.editor/VISUAL/EDITOR accept commands
16488 When generating manpages, delete outdated targets first.
16490 David Soria Parra (1):
16491 Documentation/gitattributes.txt: typofix
16494 Fix documentation for core.gitproxy to reflect code
16496 Han-Wen Nienhuys (2):
16497 Sort output of "p4 change" in incremental import before further
16498 Fix style nit in Python slicing.
16500 Jakub Narebski (3):
16501 gitweb: Show submodule entries in the 'tree' view
16502 gitweb: Simplify 'opt' parameter validation, add "no merges" feeds
16503 gitweb: Allow for multivalued parameters passed to href subroutine
16506 Documentation/git-diff: remove -r from --name-status example
16507 git-diff: turn on recursion by default
16510 --base-path-relaxed option
16512 Johannes Schindelin (11):
16513 rebase -i: fix overzealous output redirection
16514 rebase -i: fix interrupted squashing
16515 white space fixes in setup.c
16516 Add is_absolute_path() and make_absolute_path()
16517 Add functions get_relative_cwd() and is_inside_dir()
16518 Add set_git_dir() function
16519 Clean up work-tree handling
16520 get_relative_cwd(): clarify why it handles dir == NULL
16521 rebase -i: ignore patches that are already in the upstream
16522 rebase -i: fix for optional [branch] parameter
16523 read-tree: remove unnecessary call to setup_git_directory()
16525 Julian Phillips (1):
16526 git-gui: Handle git versions of the form n.n.n.GIT
16528 Junio C Hamano (23):
16529 Make sure git-stash works from subdirectory.
16530 gitweb: fix broken snapshot
16531 git-submodule module_name: avoid using unwieldy "value_regexp" feature.
16532 git-submodule: remove redundant call to git-describe
16533 When locking in a symlinked repository, try to lock the original.
16534 git_mkstemp(): be careful not to overflow the path buffer.
16535 Update description of -z option.
16536 git-stash: do not remove a ref by hand.
16537 Add test for symlinked configuration file updates.
16538 Fix git-stash apply --index
16539 git-stash apply --index: optimize postprocessing
16540 log_ref_write() -- do not chomp reflog message at the first LF
16541 symbolic-ref, update-ref: do not refuse reflog message with LF
16542 rebase: try not to munge commit log message
16543 add_file_to_index: skip rehashing if the cached stat already matches
16544 Unset GIT_EDITOR while running tests.
16545 git.c: execution path
16546 git-commit.sh: Permit the --amend message to be given with -m/-c/-C/-F.
16547 RelNotes 1.5.3 updates before -rc4
16548 Fix work-tree related breakages
16549 gitweb: do not choke on recursive symlink
16550 Fix bogus use of printf in t3700 test
16553 Kristian Høgsberg (1):
16554 Add test case for basic commit functionality.
16557 gitk: Ignore ctrl-z as EOF on windows
16559 Nanako Shiraishi (1):
16560 git-stash: Make sure reflog is created for refs/stash
16562 Nguyễn Thái Ngọc Duy (1):
16563 git-write-tree should not crash if prefix does not exist
16565 Paul Mackerras (4):
16566 gitk: Show changes in index and changes in working directory separately
16567 gitk: Make the fake commit for the index changes green rather than magenta
16568 gitk: Wait for the window to become visible after creating it
16569 gitk: Fix bugs in the Find function
16572 git-svn: Translate invalid characters in refname
16574 Robert Schiele (2):
16575 add option to find zlib in custom path
16576 make the name of the library directory a config option
16578 Robin Rosenberg (1):
16579 Document --unified/-U option
16582 Rename git-rebase interactive buffer: todo => git-rebase-todo
16584 Shawn O. Pearce (49):
16585 git-gui: Skip -dirty suffix on core git versions
16586 git-gui: Brown paper bag "dirty git version fix"
16587 git-gui: Always disable the Tcl EOF character when reading
16588 git-gui: Delay searching for 'nice' until its really asked for
16589 git-gui: Don't crash in ask_popup if we haven't mapped main window yet
16590 git-gui: Change our initial GC hint to be an estimate
16591 git-gui: Let the user continue even if we cannot understand git version
16592 git-gui: Delay the GC hint until after we are running
16593 git-gui: Move feature option selection before GIT_DIR init
16594 git-gui: Allow blame/browser subcommands on bare repositories
16595 git-gui: Allow browser subcommand to start in subdirectory
16596 git-gui: Allow users to browse any branch, not just the current one
16597 git-gui: Clarify the visualize history menu options
16598 git-gui: Increase the default height of the revision picker
16599 git-gui: Convert merge dialog to use class system
16600 Don't offer my special Tools/Migrate hack unless in multicommit
16601 git-gui: Bind Ctrl/Cmd-M to merge action
16602 git-gui: Avoid unnecessary global statements when possible
16603 git-gui: Translate standard encoding names to Tcl ones
16604 git-gui: Don't show blame tooltips that we have no data for
16605 git-gui: Completely remove support for creating octopus merges
16606 git-gui: Automatically backup the user's commit buffer
16607 git-gui: Save the merge base during checkout_op processing
16608 git-gui: Factor out common fast-forward merge case
16609 git-gui: Simplify error case for unsupported merge types
16610 git-gui: Skip unnecessary read-tree work during checkout
16611 git-gui: Internally allow fetch without storing for future pull support
16612 git-gui: Completely remove my Tools/Migrate hack
16613 git-gui: Fix unnecessary fast-forward during checkout
16614 gitk: Bind keyboard actions to the command key on Mac OS
16615 git-gui: Clarify meaning of add tracked menu option
16616 git-gui: Paper bag fix quitting crash after commit
16617 git-gui: Refactor diff popup into a procedure to ease i18n work
16618 git-gui: Refactor current branch menu items to make i18n easier
16619 git-gui: Avoid unnecessary symbolic-ref call during checkout
16620 git-gui: Save remote urls obtained from config/remotes setup
16621 git-gui: Display commit/tag/remote info in tooltip of revision picker
16622 git-gui: Show ref last update times in revision chooser tooltips
16623 git-gui: Replace merge dialog with our revision picker widget
16624 git-gui: Cleanup bindings within merge dialog
16625 git-gui: Format tracking branch merges as though they were pulls
16626 git-gui: Remove usernames from absolute SSH urls during merging
16627 git-gui: Don't kill modified commit message buffer with merge templates
16628 git-gui: Honor core.excludesfile when listing extra files
16629 git-gui: Use progress bar while resetting/aborting files
16630 git-gui: Make sure remotes are loaded when picking revisions
16631 git-gui: Don't offer to stage hunks from untracked files
16632 git-gui: Use more modern looking icons in the tree browser
16633 git-gui: Minor refactoring of merge command line in merge support
16635 Simon Hausmann (1):
16636 git-p4: Fix p4 user cache population on Windows.
16639 Try to be consistent with capitalization in the documentation
16641 Thomas Schwinge (2):
16642 Don't rely on unspecified behavior
16643 Support building on GNU/Hurd
16646 Version v1.5.3-rc3; changes since v1.5.3-rc2:
16647 ---------------------------------------------
16650 Add GIT_EDITOR environment and core.editor configuration variables
16652 Alexandre Julliard (2):
16653 git.el: Support for incremental status updates.
16654 git.el: Pass an explicit argument to enable smerge-mode.
16657 Rename read_pipe() with read_fd() and make its buffer nul-terminated.
16660 contrib/emacs/Makefile: Also install .el files.
16661 Documentation/gitignore.txt: Fix the seriously misleading priority explanation
16664 git-svn: fix commiting renames over DAV with funky file names
16666 Francis Moreau (1):
16667 Fix git-branch documentation when using remote refs
16669 Jakub Narebski (3):
16670 gitweb cleanup: Move @diff_opts declaration earlier
16671 gitweb: Fix support for legacy gitweb config for snapshots
16672 gitweb: More detailed error messages for snapshot format
16675 pretty-options.txt: tiny doc fix
16677 Johannes Schindelin (11):
16678 filter-branch: get rid of "set -e"
16679 rebase -i: call editor just once for a multi-squash
16680 fsck --lost-found: write blob's contents, not their SHA-1
16681 mailinfo: fix 'fatal: cannot convert from utf-8 to utf-8'
16682 Shut "git rebase -i" up when no --verbose was given
16683 rebase -i: exchange all "if [ .. ]" by "if test .."
16684 filter-branch: Big syntax change; support rewriting multiple refs
16685 Teach revision machinery about --no-walk
16686 git log -g: Complain, but do not fail, when no reflogs are there
16687 Teach approxidate() to understand "never"
16688 git am: skip pine's internal folder data
16690 Julian Phillips (1):
16691 Force listingblocks to be monospaced in manpages
16693 Junio C Hamano (8):
16695 Do not expect unlink(2) to fail on a directory.
16696 Fix VISUAL/EDITOR preference order in Documentation/config.txt.
16697 Synonyms: -i == --regexp-ignore-case, -E == --extended-regexp
16698 Mark user-manual as UTF-8
16699 user-manual: fix typolets.
16700 t9200: Be careful when checking CVS/Entries
16704 send-email: Update regex parsing for pine aliases
16706 Linus Torvalds (2):
16707 Do a better job at guessing unknown character sets
16708 Fix up duplicate parents removal
16710 Marco Costalba (1):
16711 Avoid to duplicate commit message when is not encoded
16713 Matt McCutchen (1):
16714 gitweb: snapshot cleanups & support for offering multiple formats
16716 Nanako Shiraishi (1):
16717 Document "git stash message..."
16720 filter-branch: fix dash complaining about "Missing '))'"
16721 cleanup unpack-trees.c: shrink struct tree_entry_list
16724 git-svn: Minimalistic patch which allows svn usernames with space(s).
16726 Robin Rosenberg (1):
16727 cvsexportcommit: avoid racy CVS problem.
16730 git-p4: use subprocess in p4CmdList
16731 git-p4: input to "p4 files" by stdin instead of arguments
16733 Simon Hausmann (3):
16734 git-p4: Cleanup, make listExistingP4Branches a global function for later use.
16735 git-p4: Fix upstream branch detection for submit/rebase with multiple branches.
16736 git-p4: Cleanup, used common function for listing imported p4 branches
16739 Document how to tell git to not launch a pager
16740 Teach git-commit about commit message templates.
16742 Sven Verdoolaege (1):
16743 unpack-trees.c: assume submodules are clean during check-out
16746 Version v1.5.3-rc2; changes since v1.5.3-rc1:
16747 ---------------------------------------------
16750 Fix git-rebase -i to allow squashing of fast-forwardable commits
16753 Use $(RM) in Makefiles instead of 'rm -f'
16756 git-svn: remove leading slashes from fetch lines in the generate config
16759 make git-send-email.perl handle email addresses with no names when Email::Valid is present
16761 Jakub Narebski (3):
16762 Update git-merge documentation.
16763 Document long options '--message=<msg>' and '--no-commit'
16764 Document git commit --untracked-files and --verbose
16767 git-cvsserver: detect/diagnose write failure, etc.
16770 Remove useless uses of cat, and replace with filename arguments
16772 Junio C Hamano (7):
16773 Make show_rfc2822_date() just another date output format.
16774 Wire new date formats to --date=<format> parser.
16775 Document new --date=<format>
16776 Add contrib/stats/mailmap.pl script
16778 Documentation/git-commit-tree: remove description of a nonexistent limitation
16781 Marius Storm-Olsen (1):
16782 Fix git-p4 on Windows to not use the Posix sysconf function.
16785 More permissive "git-rm --cached" behavior without -f.
16788 Pack-objects: properly initialize the depth value
16790 Paul Mackerras (1):
16791 gitk: Fix bug introduced by previous commit
16793 Peter Hagervall (1):
16794 Make every builtin-*.c file #include "builtin.h"
16796 Robin Rosenberg (1):
16797 Support output ISO 8601 format dates
16799 Sean Estabrooks (3):
16800 Remove "WITH_P4IMPORT" knob from the Makefile
16801 Remove p4 rpm from git.spec.in.
16802 Demote git-p4import to contrib status.
16804 Shawn O. Pearce (2):
16805 Correct trivial typo in fast-import documentation
16806 Teach fast-import to recursively copy files/directories
16808 Stephen Rothwell (1):
16809 send-email: discard blank around address in extract_valid_address as well.
16811 Sven Verdoolaege (1):
16812 lockfile.c: schedule remove_lock_file only once.
16815 Version v1.5.3-rc1; changes since v1.5.3-rc0:
16816 ---------------------------------------------
16819 fix remote.origin.url in tutorial.txt
16822 Handle missing prefix for "Subject:" as if no prefix given
16823 Handle format.subjectprefix for every command which accepts --pretty
16824 Fix t5516 to create test repo without hooks
16825 Add -v|--verbose to git remote to show remote url
16828 Remove USE_PAGER from git-pickaxe and git-annotate
16829 Add urls.txt to git-clone man page
16832 user-manual: grammar and style fixes
16834 Brian Downing (10):
16835 pack-objects: Prefer shallower deltas if the size is equal
16836 gitk: Fix for tree view ending in nested directories
16837 Pack information tool
16838 Correct shebang line for contrib/stats/packinfo.pl
16839 Don't try to delta if target is much smaller than source
16840 Support fetching the memory usage of a delta index
16841 Add functions for parsing integers with size suffixes
16842 Add pack-objects window memory usage limit
16843 Add --window-memory option to git-repack
16844 Add documentation for --window-memory, pack.windowMemory
16846 Brian Gernhardt (1):
16847 Add core.pager config variable.
16849 CJ van den Berg (1):
16850 git-submodule: Fix two instances of the same typo
16853 t7004: Skip tests for signed tags in an old version of gpg.
16854 t0030: Remove repeated instructions and add missing &&
16855 t0030: Add tests with consecutive text lines and others with spaces added.
16856 t7004: Add tests for the git tag -n option.
16857 Function stripspace now gets a buffer instead file descriptors.
16859 Daniel Barkalow (2):
16860 Add allocation and freeing functions for struct refs
16861 Some cosmetic changes to remote library
16864 Add missing functions to contrib/emacs/vc-git.el
16867 git-svn: fix blocking with svn:// servers after do_switch
16869 Frank Lichtenheld (1):
16870 cvsserver: always initialize state in argsplit()
16873 git-gui: properly popup error if gitk should be started but is not installed
16874 git-commit: don't add multiple Signed-off-by: from the same identity
16876 J. Bruce Fields (2):
16878 user-manual: more explanation of push and pull usage
16881 stash: allow running from a subdirectory
16884 Don't smash stack when $GIT_ALTERNATE_OBJECT_DIRECTORIES is too long
16886 Johannes Schindelin (24):
16887 diff --no-index: fix --name-status with added files
16888 glossary: add 'reflog'
16889 Document git-filter-branch
16890 Add diff-option --ext-diff
16891 filter-branch: add a test for the commit removal example
16892 filter-branch: make output nicer
16893 filter-branch: a few more touch ups to the man page
16894 filter-branch documentation: clarify which filters are eval'ed
16895 filter-branch: fail gracefully when a filter fails
16896 Future-proof source for changes in xdemitconf_t
16897 Teach git-stash to "apply --index"
16898 Enable "git rerere" by the config variable rerere.enabled
16899 git-branch: default to --track
16900 Fix "apply --reverse" with regard to whitespace
16901 branch.autosetupmerge: allow boolean values, or "all"
16902 rebase -i: handle --continue more like non-interactive rebase
16903 rebase -i: actually show the diffstat when being verbose
16904 rebase -i: remember the settings of -v, -s and -p when interrupted
16905 rebase -i: put a nice warning into the todo list
16906 rerere: record resolution even if file is not in merge base
16907 Fix core.sharedRepository = 2
16908 Fix --cherry-pick with given paths
16909 Add for_each_remote() function, and extend remote_find_tracking()
16910 branch --track: code cleanup and saner handling of local branches
16913 filter-branch: Avoid an error message in the map function.
16914 filter-branch documentation: some more touch-ups.
16915 Allow rebase to run if upstream is completely merged
16918 fsck --lost-found writes to subdirectories in .git/lost-found/
16920 Junio C Hamano (22):
16921 Update draft Release Notes for 1.5.3
16922 Update reflog message created for stashes
16923 Do not check if getcwd() result begins with a slash.
16924 Fix git-stash(1) markup.
16925 git-stash: allow more descriptive reminder message when saving
16926 Introduce diff_filespec_is_binary()
16927 Per-path attribute based hunk header selection.
16928 Fix configuration syntax to specify customized hunk header patterns.
16929 diff: honor binariness specified in attributes
16930 gitweb: make repeated calls to git_get_project_owner() bearable
16931 diff.c: make built-in hunk header pattern a separate table
16932 git-gui: use "blame -w -C -C" for "where did it come from, originally?"
16933 git-stash: try reusing cached stat info as much as possible
16934 Fix merge-one-file for our-side-added/our-side-removed cases
16935 Document custom hunk header selection
16936 revision.c: remove duplicated parents after history simplification
16937 Revert 88494423 (removal of duplicate parents in the output codepath)
16938 Re-code builtin-branch.c in UTF-8
16939 Teach read-tree 2-way merge to ignore intermediate symlinks
16941 Update list of older git docs
16945 git-submodule(1): update description and key names
16947 Marcus Fritzsch (1):
16948 Fixed a formulation mistake in Documentation/user-manual.txt
16951 Prefer EMAIL to username@hostname.
16952 Change "added.moved or removed" to "added, moved or removed" in
16953 Add [verse] to the SYNOPSIS section of git-submodule.txt.
16955 Matt McCutchen (3):
16956 gitweb: make search form generate pathinfo-style URLs
16957 gitweb: make "No commits" in project list gray, not bold green
16958 Makefile: rebuild git.o on version change, clean up git$X flags
16960 Matthias Lederhofer (3):
16961 git-init: set core.worktree if GIT_WORK_TREE is specified
16962 git-clone: split up long &&-command-chain and use a function for cleanup
16963 make git-clone GIT_WORK_TREE aware
16965 Michael Hendricks (2):
16966 git-send-email: allow an email alias for --from
16967 gitweb: configurable width for the projects list Description column
16970 Document -<n> for git-format-patch
16971 gitweb: prefer git_get_project_owner() over get_file_owner()
16972 gitweb: new cgi parameter: opt
16975 apply delta depth bias to already deltified objects
16976 script to display a distribution of longest common hash prefixes
16977 reduce git-pack-objects memory usage a little more
16979 Paul Mackerras (6):
16980 gitk: Fix the find and highlight functions
16981 gitk: Fix bug in the anc_or_desc routine
16982 gitk: Remove the unused stopfindproc function
16983 gitk: Fix bug causing "can't read commitrow(0,n)" error
16984 gitk: Use git log and add support for --left-right
16985 gitk: Improve handling of -- and ambiguous arguments
16988 diff-lib.c: don't strdup twice
16990 Sean Estabrooks (1):
16991 Alter git-checkout reflog message to include "from" branch
16993 Shawn O. Pearce (46):
16994 git-gui: Unlock the index when cancelling merge dialog
16995 git-gui: Start blame windows as tall as possible
16996 git-gui: Correct resizing of remote branch delete dialog
16997 git-gui: Don't bind F5/M1-R in all windows
16998 git-gui: Bind M1-P to push action
16999 git-gui: Include a Push action on the left toolbar
17000 git-gui: Ensure windows shortcuts always have .bat extension
17001 git-gui: Honor rerere.enabled configuration option
17002 git-gui: New Git version check support routine
17003 git-gui: Skip nicknames when selecting author initials
17004 git-gui: Teach class system to support [$this cmd] syntax
17005 git-gui: Abstract the revision picker into a mega widget
17006 git-gui: Refactor the delete branch dialog to use class system
17007 git-gui: Optimize for newstyle refs/remotes layout
17008 git-gui: Maintain remote and source ref for tracking branches
17009 git-gui: Allow users to match remote branch names locally
17010 git-gui: Fast-forward existing branch in branch create dialog
17011 git-gui: Enhance choose_rev to handle hundreds of branches
17012 git-gui: Sort tags descending by tagger date
17013 git-gui: Option to default new branches to match tracking branches
17014 git-gui: Automatically refresh tracking branches when needed
17015 git-gui: Better handling of detached HEAD
17016 git-gui: Refactor our ui_status_value update technique
17017 git-gui: Refactor branch switch to support detached head
17018 git-gui: Unabbreviate commit SHA-1s prior to display
17019 git-gui: Default selection to first matching ref
17020 git-gui: Allow double-click in checkout dialog to start checkout
17021 git-gui: Extract blame viewer status bar into mega-widget
17022 git-gui: Change the main window progress bar to use status_bar
17023 git-gui: Show a progress meter for checking out files
17024 git-gui: Always use absolute path to all git executables
17025 git-gui: Correct gitk installation location
17026 git-gui: Assume unfound commands are known by git wrapper
17027 git-gui: Treat `git version` as `git --version`
17028 git-gui: Perform our own magic shbang detection on Windows
17029 git-gui: Teach console widget to use git_read
17030 git-gui: Improve the Windows and Mac OS X shortcut creators
17031 git-gui: Correct ls-tree buffering problem in browser
17032 git-gui: Don't linewrap within console windows
17033 git-gui: Paper bag fix for Cygwin shortcut creation
17034 git-gui: Use sh.exe in Cygwin shortcuts
17035 git-gui: Include a space in Cygwin shortcut command lines
17036 Clarify documentation of fast-import's D subcommand
17037 Support wholesale directory renames in fast-import
17038 git-gui: Work around bad interaction between Tcl and cmd.exe on ^{tree}
17039 git-gui: Change prior tree SHA-1 verification to use git_read
17041 Steffen Prohaska (1):
17042 filter-branch: added missing warn function
17045 Documentation for git-log --follow
17047 Uwe Kleine-König (2):
17048 stash: end commit log with a newline
17049 repack: don't report "Nothing new to pack." if -q is given
17051 William Pursell (1):
17052 user-manual: fix directory name in git-archive example
17055 Version v1.5.3-rc0; changes since v1.5.2.5:
17056 -------------------------------------------
17059 git-send-email: Add --threaded option
17060 git-send-email: make options easier to configure.
17061 format-patch: Add format.subjectprefix config option
17064 Fix the progress code to output LF only when it is really needed
17065 Add run_command_v_opt_cd: chdir into a directory before exec
17066 Add ability to specify environment extension to run_command
17067 Allow environment variables to be unset in the processes started by run_command
17068 Verbose connect messages to show the IP addresses used
17069 Add another verbosity level to git-fetch
17070 Add a configuration option to control diffstat after merge
17071 Fix push with refspecs containing wildcards
17072 Do not use h_errno after connect(2): the function does not set it
17073 cvsserver: Actually implement --export-all
17074 Avoid perl in t1300-repo-config
17076 Alexandre Julliard (1):
17077 pack-check: Sort entries by pack offset before unpacking them.
17079 Alexandre Vassalotti (1):
17080 git-tag: Fix "can't shift that many".
17082 Andy Whitcroft (3):
17083 cvsimport: add support for new style remote layout
17084 cvsimport: update documentation to include separate remotes option
17085 cvsimport: add <remote>/HEAD reference in separate remotes more
17087 Aneesh Kumar K.V (2):
17088 gitview: Fix the blame interface.
17089 gitview: run blame with -C -C
17091 Benjamin Sergeant (1):
17092 git-p4 fails when cloning a p4 depo.
17094 Brian Gernhardt (1):
17095 Fix t5516-fetch for systems where `wc -l` outputs whitespace.
17098 Fix git-stripspace to process correctly long lines and spaces.
17099 Add test script for git-stripspace.
17100 Add test-script for git-tag
17103 git-mergetool: Allow gvimdiff to be used as a mergetool
17106 Custom compression levels for objects and packs
17107 Alter sha1close() 3rd argument to request flush only
17108 git-repack --max-pack-size: new file statics and code restructuring
17109 git-repack --max-pack-size: write_{object,one}() respect pack limit
17110 git-repack --max-pack-size: split packs as asked by write_{object,one}()
17111 git-repack --max-pack-size: add option parsing to enable feature
17112 pack-objects: clarification & option checks for --max-pack-size
17113 Ensure git-repack -a -d --max-pack-size=N deletes correct packs
17115 Daniel Barkalow (6):
17116 Move remote parsing into a library file out of builtin-push.
17117 Move refspec parser from connect.c and cache.h to remote.{c,h}
17118 Add handlers for fetch-side configuration of remotes.
17119 Update local tracking refs when pushing
17120 Move refspec pattern matching to match_refs().
17121 Fix pushing to a pattern with no dst
17124 Generate tags with correct timestamp (git-svnimport)
17126 Elvis Pranskevichus (1):
17127 Use git-tag in git-cvsimport
17130 git-submodule: Instead of using only annotated tags, use any tags.
17133 git-svn: cleanup: factor out longest_common_path() function
17134 git-svn: test for creating new directories over svn://
17135 git-svn: reduce stat() calls for a backwards compatibility check
17136 git-svn: allow dcommit to retain local merge information
17138 Fernando J. Pereda (1):
17139 Teach mailsplit about Maildir's
17141 Frank Lichtenheld (11):
17142 t9400: Add test cases for config file handling
17143 t9400: Add some more cvs update tests
17144 t9400: Add some basic pserver tests
17145 t9400: Work around CVS' deficiencies
17146 cvsserver: Handle 'cvs login'
17147 cvsserver: Make req_Root more critical of its input data
17148 cvsserver: Add some useful commandline options
17149 cvsserver: Let --base-path and pserver get along just fine
17150 cvsserver: Actually implement --export-all
17151 config: Add --null/-z option for null-delimted output
17152 config: add support for --bool and --int while setting values
17155 Unify write_index_file functions
17158 git-branch: cleanup config file when deleting branches
17159 git-svn: trailing slash in prefix is mandatory with --branches/-b
17160 git-cvsimport: force checkout of working tree after initial import
17162 Han-Wen Nienhuys (28):
17164 reformatting: break long lines.
17165 rename apply() to applyCommit(); apply is a python builtin
17166 add .dotest to .gitignore
17167 Robustness fixes for pipes
17170 clone and sync --keep-path to keep perforce path to module.
17171 use string.strip() iso. slicing.
17172 use strip() iso. slicing for removing \n
17173 add --verbose to all commands.
17174 Extract multiple paths concurrently.
17176 remove global .gitdir
17177 Read p4 files in one batch.
17178 Thinko, fix buglet.
17179 store p4 user cache in home directory.
17181 read files before creating the commit.
17182 don't p4 print deleted files.
17183 only run p4 print if necessary
17184 use p4CmdList() to get file contents in Python dicts. This is more robust.
17185 Cleanups & import into p4/master for local import
17187 thinko: really ignore deleted files.
17188 look for 'text' and 'binary' files.
17189 print error message when p4 print fails (eg. due to permission problems)
17190 also strip p4/ from local imports.
17192 Jakub Narebski (16):
17193 gitweb: Add test t9500 for gitweb (as standalone script)
17194 Add an option to git-ls-tree to display also the size of blob
17195 gitweb: Provide links to commitdiff to each parent in 'commitdiff' view
17196 gitweb: Improve "next" link in commitdiff view
17197 gitweb: Split git_patchset_body into separate subroutines
17198 gitweb: Create special from-file/to-file header for combined diff
17199 gitweb: Add links to blobdiffs in from-file/to-file header for merges
17200 gitweb: '--cc' for merges in 'commitdiff' view
17201 Document git rev-list --full-history
17202 Document git read-tree --trivial
17203 Document git rev-parse --is-inside-git-dir
17204 Document git reflog --stale-fix
17205 Document git rev-list --timestamp
17206 Use tabs for indenting definition list for options in git-log.txt
17207 Document git log --abbrev-commit, as a kind of pretty option
17208 Document git log --full-diff
17211 Add colour support in rebase and merge tree diff stats output.
17212 rev-parse: Identify short sha1 sums correctly.
17215 cmd_log_init: remove parsing of --encoding command line parameter
17216 refactor dir_add_name
17217 dir_struct: add collect_ignored option
17218 builtin-add: simplify (and increase accuracy of) exclude handling
17219 Fix ALLOC_GROW off-by-one
17220 Fix ALLOC_GROW calls with obsolete semantics
17221 git-stash: fix "no arguments" case in documentation
17222 git-stash: fix "can't shift that many" with no arguments
17223 git-stash: don't complain when listing in a repo with no stash
17224 Documentation: quote {non-attributes} for asciidoc
17225 Documentation: quote {non-attributes} for asciidoc
17226 Documentation: minor cleanups to branch/checkout wording
17228 Jeffrey C. Ollie (2):
17229 Add an option to quiet git-init.
17230 Quiet the output from git-init when cloning, if requested.
17233 Don't dereference a strdup-returned NULL
17234 detect close failure on just-written file handles
17235 Don't ignore a pack-refs write failure
17236 git-log: detect dup and fdopen failure
17239 Remove unnecessary code and comments on non-existing 8kB tag object restriction
17241 Johannes Schindelin (23):
17242 Update to SubmittingPatches
17243 Add git-filter-branch
17244 git-fsck: learn about --verbose
17245 Move buffer_is_binary() to xdiff-interface.h
17246 merge-recursive: refuse to merge binary files
17247 git-merge-file: refuse to merge binary files
17248 filter-branch: use $(($i+1)) instead of $((i+1))
17249 filter-branch: fix behaviour of '-k'
17250 t5000: skip ZIP tests if unzip was not found
17251 Teach filter-branch about subdirectory filtering
17252 Teach diff to imply --find-copies-harder upon -C -C
17253 pp_header(): work around possible memory corruption
17254 diffcore-rename: favour identical basenames
17255 filter-branch: add example to move everything into a subdirectory
17256 Move the pick_author code to git-sh-setup
17257 Teach rebase an interactive mode
17258 rebase -i: several cleanups
17259 rebase -i: provide reasonable reflog for the rebased branch
17260 Teach rebase -i about --preserve-merges
17261 t7004: ship trustdb to avoid gpg warnings
17262 git add: respect core.filemode with unmerged entries
17263 Make '!' aliases more useful
17264 git-fsck: add --lost-found option
17267 filter-branch: Use rev-list arguments to specify revision ranges.
17268 filter-branch: also don't fail in map() if a commit cannot be mapped
17269 Makefile: Remove git-merge-base from PROGRAMS.
17270 filter-branch: Simplify parent computation.
17271 filter-branch: subdirectory filter needs --full-history
17272 Avoid double-slash in path names that depend on $(sharedir).
17273 Remove trailing slash from $(template_dir).
17274 git-remote show: Also shorten non-fast-forward refs in the 'push' listing
17275 Test 'git add' for unmerged entries when core.symlinks=false.
17278 Add the --numbered-files option to git-format-patch.
17281 Fix git-am(1) synopsis formatting
17282 git-rebase: suggest to use git-add instead of git-update-index
17285 Fix typo in git-mergetool
17287 Julian Phillips (2):
17288 Makefile: Use generic rule to build test programs
17289 new-workdir: handle rev-parse --git-dir not always giving full path
17291 Junio C Hamano (48):
17292 git-apply: Fix removal of new trailing blank lines.
17293 pack-objects: pass fullname down to add_object_entry()
17294 Teach "delta" attribute to pack-objects.
17295 builtin-pack-objects: remove unnecessary code for no-delta
17296 Fix command line parameter parser of revert/cherry-pick
17297 Remove git-applypatch
17298 mailsplit: fix for more than one input files
17299 Add DLH to .mailmap
17300 Release Notes: start preparing for 1.5.3
17301 git-apply: what is detected and fixed is not just trailing spaces.
17302 t7003: make test repeatable
17303 git-branch --track: fix tracking branch computation.
17305 Test wildcard push/fetch
17306 More missing static
17307 More missing static
17308 Even more missing static
17309 remote.c: refactor match_explicit_refs()
17310 remote.c: refactor creation of new dst ref
17311 remote.c: minor clean-up of match_explicit()
17312 remote.c: fix "git push" weak match disambiguation
17313 remote.c: "git-push frotz" should update what matches at the source.
17314 git-push: Update description of refspecs and add examples
17315 git-blame: do not indent with spaces.
17316 git-blame -w: ignore whitespace
17317 mktag: minimally update the description.
17318 Lift 16kB limit of log message output
17319 Extend --pretty=oneline to cover the first paragraph,
17320 Makefile: common-cmds.h depends on generate-cmdlist.sh script
17321 Makefile: allow generating git.o for debugging purposes
17322 -Wold-style-definition fix
17324 Documentation: update "stale" links for 1.5.2.2
17325 INSTALL: explain how to build documentation
17326 Two trivial -Wcast-qual fixes
17327 git-send-email: Do not make @-less message ID
17328 Add core.quotepath configuration variable.
17329 Update draft Release Notes for 1.5.3
17330 diffcore_count_changes: pass diffcore_filespec
17331 diffcore_filespec: add is_binary
17332 diffcore-delta.c: update the comment on the algorithm.
17333 diffcore-delta.c: Ignore CR in CRLF for text files
17334 git-stash: require "save" to be explicit and update documentation
17335 Update public documentation links for 1.5.2.3
17336 "git-push $URL" without refspecs pushes only matching branches
17337 Rewrite "git-frotz" to "git frotz"
17338 git-stash: make "save" the default action again.
17339 Mark disused commit walkers officially deprecated.
17342 git-p4: check for existence of repo dir before trying to create
17345 Add git-submodule command
17346 Add basic test-script for git-submodule
17347 git-submodule: move cloning into a separate function
17348 git-submodule: clone during update, not during init
17349 t7400: barf if git-submodule removes or replaces a file
17350 git-submodule: remember to checkout after clone
17351 Rename sections from "module" to "submodule" in .gitmodules
17352 git-submodule: give submodules proper names
17354 gitmodules(5): remove leading period from synopsis
17356 Linus Torvalds (9):
17357 Make "git gc" pack all refs by default
17358 Make the pack-refs interfaces usable from outside
17359 Makefile: add an explicit rule for building assembly output
17360 Finally implement "git log --follow"
17361 Fix up "git log --follow" a bit..
17362 Clean up internal command handling
17363 Check for IO errors after running a command
17364 git: Try a bit harder not to lose errno in stdio
17365 Start deprecating "git-command" in favor of "git command"
17367 Marco Costalba (1):
17368 Teach 'git-apply --whitespace=strip' to remove empty lines at the end of file
17370 Marius Storm-Olsen (7):
17371 Make the command call silent
17372 Replace \r\n with \n when importing from p4 on Windows
17373 Ensure that the commit message is Windows formated (CRLF) before invoking the editor.
17374 Fix git-p4 clone (defaultDestination)
17375 Fix single branch import into remotes
17376 Exclude the HEAD symbolic ref from the list of known branches
17377 Only use double quotes on Windows
17380 gitk: Make selection highlight color configurable
17381 gitk: Update fontsize in patch / tree list
17382 gitk: Allow specifying tabstop as other than default 8 characters.
17383 gitweb.perl - Optionally send archives as .zip files
17384 gitk: Use a spinbox for setting tabstop settings
17385 gitk: Update selection background colorbar in prefs dialog
17387 Martin Koegler (5):
17388 builtin-pack-objects: don't fail, if delta is not possible
17389 git-pack-objects: cache small deltas between big objects
17390 builtin-pack-object: cache small deltas
17391 diff-delta: use realloc instead of xrealloc
17392 gitweb: Handle non UTF-8 text better
17395 rename dirlink to gitlink.
17397 Matthias Lederhofer (18):
17398 add git-filter-branch to .gitignore
17399 make clean should remove all the test programs too
17400 filter-branch: prevent filters from reading from stdin
17401 chmod +x git-filter-branch.sh
17402 rev-parse: document --is-inside-git-dir
17403 rev-parse: introduce --is-bare-repository
17405 introduce GIT_WORK_TREE to specify the work tree
17406 Use new semantics of is_bare/inside_git_dir/inside_work_tree
17407 extend rev-parse test for --is-inside-work-tree
17409 setup_git_directory: fix segfault if repository is found in cwd
17410 filter-branch: always export GIT_DIR if it is set
17411 gitweb: change filename/directory name of snapshots
17412 make git barf when an alias changes environment variables
17413 make dist: include configure script in tarball
17414 ignore git-rebase--interactive
17415 getenv/setenv: use constants if available
17417 Matthijs Melchior (1):
17418 Teach git-tag about showing tag annotations.
17420 Michael Ellerman (2):
17421 gitview: Use new-style classes
17422 gitview: Define __slots__ for Commit
17424 Michael Krelin (1):
17425 git-svn: honor ~/.subversion/ client cert file settings.
17427 Michael S. Tsirkin (1):
17428 connect: display connection progress
17430 Nanako Shiraishi (3):
17431 Cloning from a repo without "current branch"
17432 Add git-stash script
17436 allow for undeltified objects not to be reused
17437 make "repack -f" imply "pack-objects --no-reuse-object"
17438 deprecate the new loose object header format
17439 fixes to output of git-verify-pack -v
17440 improve delta long block matching with big files
17441 update diff-delta.c copyright
17442 fix repack with --max-pack-size
17443 always start looking up objects in the last used pack first
17445 Paul Mackerras (18):
17446 gitk: Use the -q flag to git checkout
17447 gitk: New infrastructure for working out branches & previous/next tags
17448 gitk: Don't try to list large numbers of tags or heads in the details pane
17449 gitk: Add some more comments to the optimize_rows procedure
17450 gitk: Improve the behaviour of the initial selection
17451 gitk: Implement a simple scheduler for the compute-intensive stuff
17452 gitk: Cope with commit messages with carriage-returns and initial blank lines
17453 gitk: Disable the head context menu entries for the checked-out branch
17454 gitk: Store ids in rowrangelist and idrowranges rather than row numbers
17455 gitk: New algorithm for drawing the graph lines
17456 gitk: Show local uncommitted changes as a fake commit
17457 gitk: Speed up the reading of references
17458 gitk: Get rid of the childlist variable
17459 gitk: Add a "reset branch to here" row context-menu operation
17460 gitk: Limit how often we change the canvas scrolling region
17461 gitk: Fix bug causing nearby tags/heads to sometimes not be displayed
17462 gitk: Improve handling of whitespace and special chars in filenames
17463 gitk: Add a progress bar to show progress while resetting
17466 git-rev-list: Add regexp tuning options
17467 git-applymbox: Remove command
17469 Pierre Habouzit (3):
17470 $EMAIL is a last resort fallback, as it's system-wide.
17471 Active_nr is unsigned, hence can't be < 0
17475 git.spec: RPM failed, looking for wrong files.
17477 Randal L. Schwartz (1):
17478 Add test-sha1 to .gitignore.
17481 t5000: silence unzip availability check
17482 diffcore-rename: don't change similarity index based on basename equality
17483 diff: round down similarity index
17485 Robin Rosenberg (1):
17486 Add option to cvs update before export
17489 git-svn: avoid string eval for defining functions
17490 git-svn: use git-log rather than rev-list | xargs cat-file
17491 git-svn: cache max revision in rev_db databases
17493 Shawn O. Pearce (24):
17494 Teach git-describe how to run name-rev
17495 Lazily open pack index files on demand
17496 Micro-optimize prepare_alt_odb
17497 Attempt to delay prepare_alt_odb during get_sha1
17499 git-gui: GUI support for running 'git remote prune <name>'
17500 git-gui: Show the git-gui library path in 'About git-gui'
17501 git-gui: Enable verbose Tcl loading earlier
17502 git-gui: Provide fatal error if library is unavailable
17503 git-gui: Disable tearoff menus on Windows, Mac OS X
17504 git-gui: Allow users to rename branches through 'branch -m'
17505 git-gui: Allow users to delete remote branches
17506 git-gui: Expose the merge.diffstat configuration option
17507 Allow contrib new-workdir to link into bare repositories
17508 Test for recent rev-parse $abbrev_sha1 regression
17509 Simplify index access condition in count-objects, pack-redundant
17510 Ensure the pack index is opened before access
17511 Style nit - don't put space after function names
17512 git-gui: Internalize symbolic-ref HEAD reading logic
17513 git-gui: Quiet our installation process
17514 Avoid src:dst syntax as default bash completion for git push
17515 Document git-gui, git-citool as mainporcelain manual pages
17516 Teach bash how to complete +refspec on git-push
17517 Correct usages of sed in git-tag for Mac OS X
17519 Simon Hausmann (223):
17520 Initial import of a python script to import changesets from Perforce into git.
17521 Added basic support for specifying the depot path to import from as well as the range of perforce changes.
17522 Slightly improved help usage output and made specifying the trailing slash for the depot path optional.
17523 Implemented basic support for converting the date of the perforce change to the git format. The timezone isn't correctly set up yet though.
17524 Some fixes to the timezone conversion between the date of a perforce change and the git commit.
17525 Speed up the import of individual files from Perforce into git by passing the output of "p4 print" directly to git fast-import. Also try to set the mode of the file in git correctly based on file type heuristics.
17526 Removed unused p4cat function and added helper function for the perforce python interface (p4Cmd).
17527 Changed the import mechanism to write to git fast-import through a pipe instead of having p4-fast-export write to stdout and let the caller connect it to git fast-import.
17528 Minor code cleanups and ported some p4 interfacing code over to the p4 python mode.
17529 Instead of parsing the output of "p4 users" use the python objects of "p4 -G users".
17530 Ported the remaining functions that parsed p4 shell output over to the p4 python interface.
17531 Avoid calling fstat for every imported file (slow!) and instead read the file data first into the python process and use the length of the bytes read for the size field of git fast-import.
17532 Permit calling p4-fast-export with a depot path that has the typical ... wildcard at the end.
17533 Fixed displaying import progress by calling flush on stdout.
17534 Create a git tag for every changeset imported from perforce.
17535 Fix file permissions of p4-fast-export.py to be executable.
17536 Started working on incremental imports from Perforce.
17537 Simplify the incremental import by elimination the need for a temporary import branch.
17538 Code cleanups, move the code to create a commit with fast-import into a separate function out of the main loop.
17539 Initial support for importing a directory from Perforce at a specified revision.
17540 Minor cleanups and print an error message of git fast-import if it fails.
17541 Fixed incremental imports by using the correct "from" command instead of "merge" with git fast-import.
17542 Make incremental imports easier to use by storing the p4 depot path after an import in .git/config and re-using it when we're invoked again later.
17543 Make specifying the revision ranges more convenient.
17544 Fix calculation of the newest imported revision for #head imports.
17545 Catch io exceptions from git fast-import again and print the error message.
17546 Made the name of the git branch used for the perforce import configurable through a new --branch=<name> commandline option.
17547 Added a little helper script to debug the output of the p4 python interface.
17548 Minor code cleanups.
17549 Avoid the excessive use of git tags for every perforce change and instead just create one git tag for the last imported change.
17550 Changed the default git import branch from "p4" to "master".
17551 Added a little helper script to remove unused tags from the perforce import.
17552 Create lightweight git tags (using the "reset" trick) for the incremental import instead of full-blown ones. Also fix parsing the output of git name-rev for figuring out the last imported p4 change number.
17553 Cleanups, remove unused variable.
17555 Started work on p4 branch detection (experimental!).
17556 More fixes in heuristic p4 branch detection based on common path components.
17557 After marking a p4 branch as merged don't ever merge it in git again.
17558 Set git fast-import marks for every imported change for future use.
17559 When trying to map p4 integrations to git merges just record it as a single merge with the newest p4 change as secondary parent.
17560 Make it possible to specify the p4 changes to import through a text file (for debugging) and made various improvements to the branch/merge heuristic detection.
17561 Use sets.Set() instead of set() to run also with older versions of Python.
17562 Fix single-branch imports by skipping the branch/merge detection correctly.
17563 Added p4 delete behavioural emulation as todo item.
17564 Added support for --silent so that p4-fast-export can be called from cronjobs.
17565 More work in --silent support.
17566 Don't print a plain newline at the end of the execution (avoids bogus cron error mails).
17567 Adjust the output parsing of git name-rev to handle the output of the latest git version.
17568 Work in progress on detecting branches.
17569 Changed --known-branches to take a file as argument instead of a comma separated list.
17570 Fixed p4-debug file extension.
17571 Make the p4 data/command cache configurable through the --cache-debug commandline option.
17572 Minor code cleanups.
17573 More code cleanups and preparations for more branch detection heuristics.
17574 More work on branch detection by implementing changeIsBranchMerge().
17575 Reduce the number of false "merges" by skipping "branch from" entries in the integrated output as well as by ignoring integrations of future (newer) changes.
17576 Split up the cache commandline options into (command) cache and data cache.
17577 First version of a new script to submit changes back to perforce from git repositories.
17578 Fix git-dir option and allow reading log substitutions from a file
17579 Lots of bugfixes to p4-git-sync.
17580 Automatically operate on a temporary branch, needed for cherry-pick to work when applying changes to
17581 Be nice and use /usr/bin/env python for the git-p4 scripts
17582 Ignore Apple resource files when importing from perforce to git.
17583 Auto-detect the current git branch before submitting back to perforce.
17584 Use p4 revert ... instead of revert -a ... after submitting, to make sure the p4 checkout is clean.
17585 Default to interactive syncing
17586 Improved the git dir detection.
17587 Pass the right number of arguments to commit, fixes single-branch imports.
17588 Start moving the git-p4 tools into one single script.
17589 Provide a little bit of help description for the git-p4 "tools".
17590 First (untested) attempt at migrating p4-git-sync into the final git-p4 script
17591 Part of the code is copyright by Trolltech ASA.
17592 sync-to-perforce is now called submit and fixed the gitdir check a little bit
17593 Completely untested "merge" of p4-fast-export.py into git-p4.py
17594 Added missing "self"s to make the script evaluate correctly.
17595 Fixed the initial version import by getting the file index correct by correctly skipping deleted files.
17596 Removed p4-fast-export and p4-git-sync as they've been integrated into git-p4 now.
17597 Start of the git-p4 documentation.
17598 Documentation enhancements.
17599 Added experimental but super-fast --apply-as-patch option to git-p4 submit
17600 Fix support for deletions in git-p4 submit when using --apply-as-patch by filtering out deletions in the diff-tree output.
17601 Made --apply-as-patch the default for git-p4 submit as it's significantly faster.
17602 Make it possible to invoke git-p4 from within subdirectories of a git working tree.
17603 Don't show the submit template and the diff first in less but show it in $editor right away
17604 Removed the .py extension from git-p4 as it's annoying to type every time.
17605 Changed the format of the imported log message slightly, so that it's easier to parse again.
17606 Changed the default branch for imports from "master" to "p4"
17607 Added some helper function(s) to parse the depot path and change number from the log message
17608 Helper function to check the existance of a revision
17609 Set the default branch in run, not in the constructor
17610 Brand new smart incremental import that doesn't need tags or git repo-config :)
17611 Make it possible to run git-p4 submit from within the git repository
17612 Use the new incremental import style by default
17613 Different versions of p4 have different output for the where command ;(
17614 Minor cosmetic fixlet for the git-p4 submit sync question.
17615 Prefer git command over git-command.
17616 Don't try to parse any options with git-p4 debug but pass it straight on to p4
17617 git-p4 debug doesn't need a git repository
17618 Added support for mapping p4 labels to git tags
17619 Fix variable usage in tag import
17620 Fix the docs for git-p4 submit and turn git-p4 submit --master=foo into simply git-p4 submit mytopicbranch.
17621 Fix "compilation" :)
17622 Clean up python class names.
17623 Added git-p4 rebase convenience
17624 Provide a tree summary after git-p4 rebase
17625 Turn off potentially slow label detection by default
17626 Honor --silent for labels
17627 Added git-p4 clone convenience command
17628 Fix file determination for #head imports
17629 fix variable usage (oops)
17630 Added a simple example of usage to the "documentation" :)
17631 Allow for convenient rebasing after git-p4 submit
17632 Print an error message of some sort if git fast-import fails.
17633 Fix the timezone formatting. Now qgit also displays (parses) it correctly.
17634 Removed the old patch apply code from git-p4 submit.
17635 Slightly improved formatting of the raw_input questions.
17636 A new attempt at fixing the child-fast-import-process-not-finished race condition in the clone command
17637 Handle patch errors in git-p4 submit better.
17640 cleanup, renamed self.globalPrefix to self.depotPath
17641 Cleanup, removed the old tagging code
17642 Document some implementation details, for the curious... :)
17643 Use the subprocess module instead of popen2 to make it work on Windows.
17644 Added a little .bat wrapper from Marius
17645 Make sure all popen calls use binary mode (for Windows) and
17646 Make submitting work on Windows.
17647 Converted to unix newlines
17648 Fix git-p4 clone //depot/project (head import)
17649 Make git-p4 work with bare repositories.
17650 Added the possibility of skipping patches during git-p4 submit
17651 Give a better hint if git-p4 submit fails
17652 Fix calling git-p4 rebase from within a subdirectory (git rebase wants to be in toplevel)
17653 A little todo note before I forget it :), based on a suggestion from Lars.
17654 Fixing syncing (gitdir discovery / cd) for bare repositories
17655 Always pass a sha1 for the initial parent so that git-fast-import doesn't think it's creating a new branch from itself. It's a sensible error in general but in the case of incremental imports we have to apply force :)
17656 Clean up code duplication for revision parsing and fix previous commit to not import into remotes/p4 (yet!).
17657 Removed cleantags command. It doesn't have any meaning anymore.
17658 Removed ancient and unused code to find the last imported revision from previous imports to use for the current import by looking at the p4 tags. The current approach of using the log message works better.
17659 Create the origin based import branch using git update-ref instead of git branch so that it's possible to have the import branch in refs/remotes.
17660 Changed the default p4 import branch to be refs/remotes/p4/{HEAD,master} instead of refs/heads/p4.
17661 Bite the bullet and automatically convert old style refs/heads/p4 repositories to the new style refs/remotes/p4 branching.
17662 Added support for git-p4 sync/rebase --with-origin. See git-p4.txt for details :)
17663 Removed todo item that is implemented :)
17664 Fix branch setup after initial clone.
17665 Removed unused cache variables.
17666 Started rewriting the branch detection, based on "p4 branches" and "p4 branch -o foo".
17667 Give branches a nice project prefix and don't bail out on clone if we failed to detect the master branch.
17668 More work on the incremental importing of multiple branches. Improved error detection by checking the exit code of git-fast-import.
17669 Cleanup/speed up the branch<> file split and removed change range limitation that I added for debugging (oops).
17670 More cleanups and speedups for labels and branches
17671 Removed unused variable, more cleanups
17672 Cache the output of "p4 users" for faster syncs on high latency links.
17673 Fix gitdir not being set when cloning. Needed for writing the p4 users cache.
17674 Oops, not only /set/ gitdir on clone, also set it /correctly/ :)
17675 Use git format-patch and git apply --apply when extracting patches from git and applying them to a Perforce checkout. This should make it possible to apply git commits with binary files that cannot be handled by path.
17676 Added support for git-p4 submit --direct (experimental)
17677 Specifying --detect-branches is now only needed for the initial clone/sync. Afterwards it's turned on implicitly if more p4 branches than remotes/p4/master are found.
17678 Had an idea for debugging, record it :)
17679 Another (potentially life-saving) idea for submit --direct
17680 Improved output for multi branch imports and noted another little todo item
17681 Fix conversion from old style heads/p4 to remotes/p4/master
17682 Fix error detection with git-p4 submit when the requested depot path is not in the client view.
17683 Fix git symbolic-ref warning on initial clone
17684 Detect with git-p4 submit --direct when there are no changes in the working directory
17685 Make git-p4 submit --direct safer by also creating a git commit
17686 Added a rollback command for debugging. It sets back the heads of the p4 branches to the specified p4 change number or earlier.
17687 Fix branch detection in multi-branch imports
17688 Fixes for rollback, delete branches that did not exist at the specified p4 change
17689 Added support for importing multiple branches into refs/heads instead of just refs/remotes using --import-local. Needs some further microfix but seems to work otherwise.
17690 Added support for --max-changes=<count> to ease import debugging
17691 Use refs/heads/* instead of refs/heads/p4/* for local imports
17693 Avoid calling git symbolic-ref refs/heads/p4//HEAD (double slash)
17694 Make rollback work with locally imported branches
17695 Don't make len(p4Cmd("p4 changes -m 1 //foo/...")) == 0 succeed when the p4 command itself failed.
17696 Oops, fill the /list/ correct with the p4 exit code.
17697 Catch p4 errors in rollback early enough (before deleting refs!)
17698 Fix p4 execution in git-p4 rollback.
17699 Fix multi-branch import with --silent.
17700 Load the user map from p4 only once at run-time.
17701 Fix creating the remotes/p4 branches based on origin/* for the multi-branch import
17702 Forgot to remove this return statement from debugging
17703 Added support for --with-origin with multi-branch imports
17704 Oops, fix --with-origin to /really/ also call git fetch :)
17705 Avoid creating non-p4 branches in remotes/p4 off of remotes/origin
17706 Make git-p4 work with packed refs (don't use os.path.exists to check for the existance of a ref)
17707 Make --with-origin also work without origin :)
17708 Make --with-origin the default for syncing.
17709 Shortcut the case where we have no origin branch
17710 Forgot to remove this TODO item when I made --with-origin the default :)
17711 Added git-p4 submit --trust-me-like-a-fool for the adventurous users :)
17712 Fix creation of refs/remotes/p4/HEAD symbolic ref
17713 Fix my email address, this isn't really KDE related :)
17714 In *_pipe print the command that failed if it fails. Fixed old calls to mypopen.
17715 Fix typo in listExistingP4Branches that broke sync.
17716 Fix support for "depot-path" in older git-p4 imports
17717 Fix common path "calculation" from logs of multiple branches. Need to use min instead of max for prev/cur to avoid out-of-bounds string access. Also treat "i" as index of the last match instead of a length because in case of a complete match of the two strings i was off by one.
17718 Don't attempt to set the initialParent on multi-branch imports (useless). At some point the code paths should be unified, but for now I need a working git-p4 :)
17719 Hack to make the multi-branch import work again with self.depotPaths now that self.depotPath is gone
17722 Fix depot-path determination for git-p4 submit
17723 Make clone behave like git clone by default again.
17724 Make git-p4 submit detect the correct reference (origin) branch when working with multi-branch imports.
17725 Only get the expensive branch mapping from the p4 server when not syncing with the help of an origin remote (which we instead then use to get new branches from).
17726 Fixed the check to make sure to exclude the HEAD symbolic refs when updating the remotes/p4 branches from origin.
17727 Fix updating/creating remotes/p4/* heads from origin/p4/*
17728 Fix project name guessing
17729 Fix depot-paths encoding for multi-path imports (don't split up //depot/path/foo)
17730 Fix support for explicit disabling of syncing with the origin
17731 Write out the options tag in the log message of imports only if we actually have options
17732 Provide some information for single branch imports where the commits go
17733 Mention remotes/p4/master also in the documentation.
17734 git-p4 submit: Fix missing quotes around p4 commands to make them work with spaces in filenames
17735 Moved the code from git-p4 submit to figure out the upstream branch point into a separate helper method.
17736 Fix git-p4 rebase to detect the correct upstream branch instead of unconditionally always rebasing on top of remotes/p4/master
17737 Fix initial multi-branch import.
17738 Fix the branch mapping detection to be independent from the order of the "p4 branches" output.
17739 Warn about conflicting p4 branch mappings and use the first one found.
17740 Added git-p4 branches command that shows the mapping of perforce depot paths to imported git branches.
17741 Make it possible to specify the HEAD for the internal findUpstreamBranchPoint function.
17742 git-new-workdir: Fix shell warning about operator == used with test.
17744 Sven Verdoolaege (4):
17745 git-update-ref: add --no-deref option for overwriting/detaching ref
17746 t9500: skip gitweb tests if perl version is too old
17747 git-submodule: provide easy way of adding new submodules
17748 git-clone: fetch possibly detached HEAD over dumb http
17751 Add --aggressive option to 'git gc'
17752 Fix minor grammatical typos in the git-gc man page
17753 git-mergetool: Make default selection of merge-tool more intelligent
17754 Don't fflush(stdout) when it's not helpful
17757 Change default man page path to /usr/share/man
17760 Version v1.5.2.5; changes since v1.5.2.4:
17761 -----------------------------------------
17763 Christian Couder (1):
17764 rev-list --bisect: fix allocation of "int*" instead of "int".
17766 Julian Phillips (1):
17767 Force listingblocks to be monospaced in manpages
17769 Junio C Hamano (4):
17770 Do not expect unlink(2) to fail on a directory.
17771 setup.c:verify_non_filename(): don't die unnecessarily while disambiguating
17772 Fix "git add -u" data corruption.
17775 Linus Torvalds (1):
17776 apply: remove directory that becomes empty by renaming the last file away
17778 Salikh Zakirov (1):
17779 git-add -u paths... now works from subdirectory
17782 Version v1.5.2.4; changes since v1.5.2.3:
17783 -----------------------------------------
17786 Make git-prune submodule aware (and fix a SEGFAULT in the process)
17787 user-manual: grammar and style fixes
17790 git-gui: properly popup error if gitk should be started but is not installed
17792 J. Bruce Fields (2):
17794 user-manual: more explanation of push and pull usage
17797 Don't smash stack when $GIT_ALTERNATE_OBJECT_DIRECTORIES is too long
17799 Johannes Schindelin (3):
17800 diff --no-index: fix --name-status with added files
17801 glossary: add 'reflog'
17802 Fix "apply --reverse" with regard to whitespace
17804 Junio C Hamano (2):
17805 Teach read-tree 2-way merge to ignore intermediate symlinks
17808 Michael Hendricks (1):
17809 Correctly document the name of the global excludes file configuration
17812 Document -<n> for git-format-patch
17814 Shawn O. Pearce (10):
17815 git-gui: Unlock the index when cancelling merge dialog
17816 git-gui: Don't bind F5/M1-R in all windows
17817 git-gui: Bind M1-P to push action
17818 git-gui: Include a Push action on the left toolbar
17819 git-gui: Ensure windows shortcuts always have .bat extension
17820 git-gui: Skip nicknames when selecting author initials
17821 git-gui: Correct ls-tree buffering problem in browser
17822 git-gui: Don't linewrap within console windows
17823 Clarify documentation of fast-import's D subcommand
17824 git-gui: Work around bad interaction between Tcl and cmd.exe on ^{tree}
17826 William Pursell (1):
17827 user-manual: fix directory name in git-archive example
17830 Version v1.5.2.3; changes since v1.5.2.2:
17831 -----------------------------------------
17833 Frank Lichtenheld (2):
17834 config: Complete documentation of --get-regexp
17835 config: Change output of --get-regexp for valueless keys
17837 Junio C Hamano (1):
17840 Linus Torvalds (1):
17841 Fix zero-object version-2 packs
17844 Correct the name of NO_R_TO_GCC_LINKER in the comment describing it.
17847 cleanup merge-base test script
17848 repack: improve documentation on -a option
17849 git-remote: document -n
17851 Shawn O. Pearce (5):
17852 git-gui: Correctly install to /usr/bin on Cygwin
17853 git-gui: Bind Tab/Shift-Tab to cycle between panes in blame
17854 git-gui: Don't require $DISPLAY just to get --version
17855 git-gui: Don't nice git blame on MSYS as nice is not supported
17856 git-gui: Don't require a .pvcsrc to create Tools/Migrate menu hack
17858 Sven Verdoolaege (1):
17859 Ignore submodule commits when fetching over dumb protocols
17862 Version v1.5.2.2; changes since v1.5.2.1:
17863 -----------------------------------------
17866 Make the installation target of git-gui a little less chatty
17867 Fix clone to setup the origin if its name ends with .git
17868 Add a local implementation of hstrerror for the system which do not have it
17871 Fix typo in remote branch example in git user manual
17873 J. Bruce Fields (4):
17874 user-manual: quick-start updates
17875 user-manual: add a missing section ID
17876 Documentation: user-manual todo
17877 tutorial: use "project history" instead of "changelog" in header
17879 Jakub Narebski (1):
17880 Generated spec file to be ignored is named git.spec and not git-core.spec
17882 Johannes Schindelin (2):
17883 Move buffer_is_binary() to xdiff-interface.h
17884 merge-recursive: refuse to merge binary files
17887 Accept dates before 2000/01/01 when specified as seconds since the epoch
17889 Junio C Hamano (6):
17890 checkout: do not get confused with ambiguous tag/branch names
17891 $EMAIL is a last resort fallback, as it's system-wide.
17892 git-branch --track: fix tracking branch computation.
17893 Avoid diff cost on "git log -z"
17894 Documentation: adjust to AsciiDoc 8
17897 Kristian Høgsberg (1):
17898 Unquote From line from patch before comparing with given from address.
17900 Luiz Fernando N. Capitulino (1):
17901 git-cherry: Document 'limit' command-line option
17903 Matthijs Melchior (1):
17904 New selection indication and softer colors
17906 Michael Milligan (1):
17907 git-cvsimport: Make sure to use $git_dir always instead of .git sometimes
17910 fix documentation of unpack-objects -n
17911 Don't assume tree entries that are not dirs are blobs
17913 Shawn O. Pearce (47):
17914 git-gui: Allow creating a branch when none exists
17915 git-gui: Allow as few as 0 lines of diff context
17916 git-gui: Don't quit when we destroy a child widget
17917 git-gui: Attach font_ui to all spinbox widgets
17918 git-gui: Verify Tcl/Tk is new enough for our needs
17919 Revert "Make the installation target of git-gui a little less chatty"
17920 git-gui: Add a 4 digit commit abbreviation to the blame viewer
17921 git-gui: Cleanup blame::new widget initialization
17922 git-gui: Remove empty blank line at end of blame
17923 git-gui: Improve the coloring in blame viewer
17924 git-gui: Simplify consecutive lines that come from the same commit
17925 git-gui: Use arror cursor in blame viewer file data
17926 git-gui: Display tooltips in blame viewer
17927 git-gui: Highlight the blame commit header from everything else
17928 git-gui: Remove unnecessary reshow of blamed commit
17929 git-gui: Cleanup minor style nit
17930 git-gui: Space the commit group continuation out in blame view
17931 git-gui: Show author initials in blame groups
17932 git-gui: Allow the user to control the blame/commit split point
17933 git-gui: Display a progress bar during blame annotation gathering
17934 git-gui: Allow digging through history in blame viewer
17935 git-gui: Combine blame groups only if commit and filename match
17936 git-gui: Show original filename in blame tooltip
17937 git-gui: Use a label instead of a button for the back button
17938 git-gui: Clip the commit summaries in the blame history menu
17939 git-gui: Remove the loaded column from the blame viewer
17940 git-gui: Remove unnecessary space between columns in blame viewer
17941 git-gui: Use lighter colors in blame view
17942 git-gui: Make the line number column slightly wider in blame
17943 git-gui: Automatically expand the line number column as needed
17944 git-gui: Remove unused commit_list from blame viewer
17945 git-gui: Better document our blame variables
17946 git-gui: Cleanup redundant column management in blame viewer
17947 git-gui: Switch internal blame structure to Tcl lists
17948 git-gui: Label the uncommitted blame history entry
17949 git-gui: Rename fields in blame viewer to better descriptions
17950 git-gui: Display the "Loading annotation..." message in italic
17951 git-gui: Run blame twice on the same file and display both outputs
17952 git-gui: Display both commits in our tooltips
17953 git-gui: Jump to original line in blame viewer
17954 git-gui: Use three colors for the blame viewer background
17955 git-gui: Improve our labeling of blame annotation types
17956 git-gui: Favor the original annotations over the recent ones
17957 git-gui: Changed blame header bar background to match main window
17958 git-gui: Include 'war on whitespace' fixes from git.git
17959 git-gui: Give amend precedence to HEAD over MERGE_MSG
17960 git-gui: Save geometry before the window layout is damaged
17962 William Pursell (1):
17963 Make command description imperative statement, not third-person present.
17966 Version v1.5.2.1; changes since v1.5.2:
17967 ---------------------------------------
17970 Fix mishandling of $Id$ expanded in the repository copy in convert.c
17971 Add test case for $Id$ expanded in the repository
17974 fix memory leak in parse_object when check_sha1_signature fails
17977 git-svn: avoid md5 calculation entirely if SVN doesn't provide one
17979 Fernando J. Pereda (1):
17980 Use PATH_MAX instead of TEMPFILE_PATH_LEN
17982 Frank Lichtenheld (7):
17983 t1300: Add tests for git-config --bool --get
17984 git-config: Correct asciidoc documentation for --int/--bool
17985 cvsserver: Correct inetd.conf example in asciidoc documentation
17986 cvsserver: Note that CVS_SERVER can also be specified as method variable
17987 cvsserver: Fix some typos in asciidoc documentation
17988 git-config: Various small fixes to asciidoc documentation
17989 git-config: Improve documentation of git-config file handling
17991 Jakub Narebski (3):
17992 Documentation: Clean up links in GIT Glossary
17993 Replace the last 'dircache's by 'index'
17994 Documentation: Add definition of "evil merge" to GIT Glossary
17997 Documentation: fix git-config.xml generation
17999 James Y Knight (1):
18000 Fix git-svn to handle svn not reporting the md5sum of a file, and test.
18003 git-am: use printf instead of echo on user-supplied strings
18004 More echo "$user_message" fixes.
18005 Documentation: robustify asciidoc GIT_VERSION replacement
18007 Jerald Fitzjerald (1):
18008 decode_85(): fix missing return.
18011 git-daemon: don't ignore pid-file write failure
18014 Fix stupid typo in lookup_tag()
18016 Johannes Schindelin (2):
18017 SubmittingPatches: mention older C compiler compatibility
18018 git-status: respect core.excludesFile
18021 branch: fix segfault when resolving an invalid HEAD
18022 Update bash completion to ignore some more plumbing commands
18025 Create a new manpage for the gitignore format, and reference it elsewhere
18027 Junio C Hamano (6):
18028 annotate: make it work from subdirectories.
18029 git-cvsserver: fix disabling service via per-method config
18030 name-rev: tolerate clock skew in committer dates
18031 git-commit: use printf '%s\n' instead of echo on user-supplied strings
18032 Add tests for the last two fixes.
18035 Kristian Høgsberg (1):
18036 Use =20 when rfc2047 encoding spaces.
18038 Linus Torvalds (1):
18039 fix signed range problems with hex conversions
18041 Nguyễn Thái Ngọc Duy (1):
18042 Makefile: Remove git-fsck and git-verify-pack from PROGRAMS
18045 Document branch.autosetupmerge.
18047 Shawn O. Pearce (12):
18048 git-gui: Tighten internal pattern match for lib/ directory
18049 Refactor fast-import branch creation from existing commit
18050 Fix possible coredump with fast-import --import-marks
18051 Hide the plumbing diff-{files,index,tree} from bash completion
18052 Teach bash completion about git-shortlog
18053 Remove a duplicate --not option in bash completion
18054 Update bash completion header documentation
18055 Teach bash completion about 'git remote update'
18056 Teach bash completion about recent log long options
18057 Update bash completion for git-config options
18058 Correct key bindings to Control-<foo>
18059 git-gui: Guess our share/git-gui/lib path at runtime if possible
18061 Simon Hausmann (2):
18062 fast-import: Fix uninitialized variable
18063 fast-import: Fix crash when referencing already existing objects
18065 Steffen Prohaska (1):
18066 user-manual: fixed typo in example
18068 Stephan Springl (1):
18069 Use git-for-each-ref to check whether the origin branch exists.
18071 Sven Verdoolaege (1):
18072 unpack-trees.c: verify_uptodate: remove dead code
18075 Version v1.5.2; changes since v1.5.2-rc3:
18076 -----------------------------------------
18079 Allow fetching references from any namespace
18082 Use $Id$ as the ident attribute keyword rather than $ident$ to be consistent with other VCSs
18083 Fix crlf attribute handling to match documentation
18085 Andy Whitcroft (1):
18086 git name-rev writes beyond the end of malloc() with large generations
18089 git-svn: don't drop the username from URLs when dcommit is run
18090 git-svn: clean up caching of SVN::Ra functions
18091 git-svn: fix segfaults due to initial SVN pool being cleared
18092 git-svn: don't attempt to minimize URLs by default
18093 git-svn: avoid crashing svnserve when creating new directories
18094 git-svn: don't minimize-url when doing an init that tracks multiple paths
18096 Frank Lichtenheld (5):
18097 cvsserver: Limit config parser to needed options
18098 cvsserver: Don't send mixed messages to clients
18099 builtin-log.c: Fix typo in comment
18100 Documentation: format-patch has no --mbox option
18101 git-am: Clean up the asciidoc documentation
18103 J. Bruce Fields (14):
18104 user-manual: revise birdseye-view chapter
18105 glossary: expand and clarify some definitions, prune cross-references
18106 user-manual: move quick-start to an appendix
18107 Documentation: remove howto's now incorporated into manual
18108 user-manual: move howto/make-dist.txt into user manual
18109 user-manual: move howto/using-topic-branches into manual
18110 user-manual: add a "counting commits" example
18111 user-manual: introduce git
18112 user-manual: listing commits reachable from some refs not others
18113 user-manual: reorganize public git repo discussion
18114 tutorials: add user-manual links
18115 tutorial: revise index introduction
18116 user-manual: discourage shared repository
18117 user-manual: finding commits referencing given file content
18119 Jakub Narebski (10):
18120 gitweb: Test if $from_id and $to_id are defined before comparison
18121 gitweb: Check if requested object exists
18122 gitweb: Fix "Use of unitialized value" warnings in empty repository
18123 Documentation: Split description of pretty formats of commit log
18124 gitweb: Add a few comments about %feature hash
18125 gitweb: Do not use absolute font sizes
18126 gitweb: Separate search regexp from search text
18127 gitweb: Empty patch for merge means trivial merge, not no differences
18128 gitweb: Fix error in git_patchset_body for deletion in merge commit
18129 gitweb: Fix "Use of uninitialized value" warning in git_feed
18132 Updated documentation of hooks in git-receive-pack.
18133 Minor fixup to documentation of hooks in git-receive-pack.
18136 git-add: allow path limiting with -u
18137 Documentation/git-add: clarify -u with path limiting
18138 format-patch: add MIME-Version header when we add content-type.
18141 Fix signedness on return value from xread()
18142 Ensure return value from xread() is always stored into an ssize_t
18143 user-manual: Add section on ignoring files
18145 Johannes Schindelin (2):
18146 import-tars: Use the "Link indicator" to identify directories
18147 Add a birdview-on-the-source-code section to the user manual
18149 Junio C Hamano (17):
18150 Minor copyediting on Release Notes for 1.5.2
18151 Add has_symlink_leading_path() function.
18152 apply: do not get confused by symlinks in the middle
18153 read-tree -m -u: avoid getting confused by intermediate symlinks.
18154 t9400: Use the repository config and nothing else.
18155 checkout: allow detaching to HEAD even when switching to the tip of a branch
18156 git-config: do not forget seeing "a.b.var" means we are out of "a.var" section.
18157 Link to HTML version of external doc if available
18158 Fix git-clone buglet for remote case.
18159 Prepare for 1.5.1.5 Release Notes
18160 gitweb: fix another use of undefined value
18162 Add link to 1.5.1.5 release notes.
18163 Documentation/git.txt: Update links to older documentation pages.
18165 git-cvsserver: exit with 1 upon "I HATE YOU"
18169 git-archive: don't die when repository uses subprojects
18171 Marco Costalba (1):
18172 Fix an unmatched comment end in arm/sha1_arm.S
18174 Matthias Kestenholz (2):
18175 Documentation: Added [verse] to SYNOPSIS where necessary
18176 Documentation: Reformatted SYNOPSIS for several commands
18178 Matthieu Castet (1):
18179 Remove stale non-static-inline prototype for tree_entry_extract()
18181 Michael Hendricks (2):
18182 git-send-email: allow leading white space on mutt aliases
18183 Document core.excludesfile for git-add
18186 gitweb: Normalize searchbar font size
18187 gitweb: Add support for grep searches
18188 gitweb: Allow arbitrary strings to be dug with pickaxe
18189 Documentation: git-rev-list's "patterns"
18190 gitweb: Remove redundant $searchtype setup
18193 RPM spec: include files in technical/ to package.
18194 Documentation/branch: fix small typo in -D example
18197 git-archive: convert archive entries like checkouts do
18199 Shawn O. Pearce (1):
18200 git-gui: Gracefully handle bad TCL_PATH at compile time
18202 Steffen Prohaska (4):
18203 tiny fix in documentation of git-clone
18204 git-config: test for 'do not forget "a.b.var" ends "a.var" section'.
18205 Optimized cvsexportcommit: calling 'cvs status' once instead of once per touched file.
18206 Fixed link in user-manual
18209 Version v1.5.2-rc3; changes since v1.5.2-rc2:
18210 ---------------------------------------------
18213 Use GIT_OBJECT_DIR for temporary files of pack-objects
18215 Amos Waterland (1):
18216 wcwidth redeclaration
18218 Frank Lichtenheld (1):
18219 cvsserver: Add test cases for git-cvsserver
18222 gitweb: choose appropriate view for file type if a= parameter missing
18224 J. Bruce Fields (7):
18225 user-manual: more discussion of detached heads, fix typos
18226 user-manual: add section ID's
18227 user-manual: clean up fast-forward and dangling-objects sections
18228 user-manual: fix .gitconfig editing examples
18229 user-manual: miscellaneous editing
18230 user-manual: stop deprecating the manual
18231 user-manual: fix clone and fetch typos
18233 Jakub Narebski (6):
18234 gitweb: Add parsing of raw combined diff format to parse_difftree_raw_line
18235 gitweb: Add combined diff support to git_difftree_body
18236 gitweb: Add combined diff support to git_patchset_body
18237 gitweb: Make it possible to use pre-parsed info in git_difftree_body
18238 gitweb: Show combined diff for merge commits in 'commitdiff' view
18239 gitweb: Show combined diff for merge commits in 'commit' view
18242 SPECIFYING RANGES typo fix: it it => it is
18245 Documentation: don't reference non-existent 'git-cvsapplycommit'
18248 git-gui: Call changes "Staged" and "Unstaged" in file list titles.
18250 Junio C Hamano (10):
18251 diff: release blobs after generating textual diff.
18252 diff.c: do not use a separate "size cache".
18253 diff -M: release the preimage candidate blobs after rename detection.
18254 diff -S: release the image after looking for needle in it
18256 Update documentation links to point at 1.5.1.4
18257 t9400: skip cvsserver test if Perl SQLite interface is unavailable
18258 git-clone: don't get fooled by $PWD
18259 .mailmap: add some aliases
18263 Document git add -u introduced earlier.
18264 Added a reference to git-add in the documentation for git-update-index
18266 Michael Hendricks (1):
18267 Document 'git-log --decorate'
18270 dir.c: Omit non-excluded directories with dir->show_ignored
18271 t7300: Basic tests for git-clean
18272 Fix minor documentation errors
18274 Paul Mackerras (1):
18275 gitk: Allow user to choose whether to see the diff, old file, or new file
18278 Git.pm: config_boolean() -> config_bool()
18279 gitweb: Do not use absolute font sizes
18282 Add howto files to rpm packages.
18283 Added new git-gui library files to rpm spec
18285 Richard P. Curnow (2):
18286 Fix documentation of tag in git-fast-import.txt
18287 Fix documentation of tag in git-fast-import.txt
18289 Shawn O. Pearce (32):
18290 git-gui: Correctly handle UTF-8 encoded commit messages
18291 git-gui: Allow spaces in path to 'wish'
18292 git-gui: Include the subject in the status bar after commit
18293 git-gui: Warn users before making an octopus merge
18294 git-gui: Correct line wrapping for too many branch message
18295 git-gui: Cleanup common font handling for font_ui
18296 git-gui: Use option database defaults to set the font
18297 git-gui: Refactor to use our git proc more often
18298 git-gui: Track our own embedded values and rebuild when they change
18299 Properly handle '0' filenames in import-tars
18300 git-gui: Refactor into multiple files to save my sanity
18301 git-gui: Move console procs into their own namespace
18302 git-gui: Allow vi keys to scroll the diff/blame regions
18303 git-gui: Move merge support into a namespace
18304 git-gui: Show all possible branches for merge
18305 git-gui: Include commit id/subject in merge choices
18306 git-gui: Use vi-like keys in merge dialog
18307 Remove duplicate exports from Makefile
18308 git-gui: Allow shift-{k,j} to select a range of branches to merge
18309 git-gui: Define a simple class/method system
18310 git-gui: Convert browser, console to "class" format
18311 git-gui: Don't attempt to inline array reads in methods
18312 git-gui: Convert blame to the "class" way of doing things
18313 git-gui: Use prefix if blame is run in a subdirectory
18314 git-gui: Smarter command line parsing for browser, blame
18315 git-gui: Generate blame on uncommitted working tree file
18316 git-gui: Cleanup minor nits in blame code
18317 git-gui: Format author/committer times in ISO format
18318 Use .git/MERGE_MSG in cherry-pick/revert
18319 git-gui: Paperbag fix blame in subdirectory
18321 Correct error message in revert/cherry-pick
18324 Add pack.depth option to git-pack-objects.
18325 Increase pack.depth default to 50
18328 Version v1.5.2-rc2; changes since v1.5.2-rc1:
18329 ---------------------------------------------
18332 Small correction in reading of commit headers
18333 Handle return code of parse_commit in revision machinery
18335 Alexandre Julliard (1):
18336 http-fetch: Disable use of curl multi support for libcurl < 7.16.
18338 Arjen Laarhoven (1):
18339 Document 'opendiff' value in config.txt and git-mergetool.txt
18342 Allow PERL_PATH="/usr/bin/env perl"
18343 posix compatibility for t4200
18346 Mention version 1.5.1 in tutorial and user-manual
18349 Create pack-write.c for common pack writing code
18351 Daniel Barkalow (1):
18352 Make xstrndup common
18354 Frank Lichtenheld (1):
18355 cvsserver: Handle re-added files correctly
18357 Jakub Narebski (1):
18358 diff format documentation: describe raw combined diff format
18361 Documentation: fix typo in git-remote.txt
18363 Johannes Schindelin (1):
18364 Teach import-tars about GNU tar's @LongLink extension.
18367 git-tag(1): -v option is a subcommand; fix code block
18369 Junio C Hamano (6):
18370 blame: use .mailmap unconditionally
18371 diff.c: fix "size cache" handling.
18372 blame: Notice a wholesale incorporation of an existing file.
18374 Add test for blame corner cases.
18377 Karl Hasselström (2):
18378 Fix markup in git-svn man page
18379 Add --no-rebase option to git-svn dcommit
18381 Linus Torvalds (1):
18382 Fix --boundary output
18384 Martin Koegler (1):
18385 Fix compilation of test-delta
18387 Shawn O. Pearce (3):
18388 Reuse fixup_pack_header_footer in index-pack
18389 Don't use seq in tests, not everyone has it
18390 Improve request-pull to handle non-rebased branches
18393 gitweb: use decode_utf8 directly
18396 Version v1.5.2-rc1; changes since v1.5.2-rc0:
18397 ---------------------------------------------
18400 Remove usernames from all commit messages, not just when using svmprops
18401 git-svn: Don't rely on $_ after making a function call
18402 git-svn: Ignore usernames in URLs in find_by_url
18403 git-svn: Added 'find-rev' command
18404 git-svn: Add 'find-rev' command
18407 Fix handle leak in write_tree
18408 Avoid excessive rewrites in merge-recursive
18409 Add a test for merging changed and rename-changed branches
18410 Ignore merged status of the file-level merge
18411 Use strlcpy instead of strncpy in mailmap.c
18412 Fix read_mailmap to handle a caller uninterested in repo abbreviation
18413 Remove pointless calls to access(2) when checking for .mailmap
18414 Include mailmap.h in mailmap.c to catch mailmap interface changes
18417 Removing -n option from git-diff-files documentation
18418 Document additional options for git-fetch
18419 Update git-fmt-merge documentation
18420 Update git-grep documentation
18421 Update -L documentation for git-blame/git-annotate
18422 Update git-http-push documentation
18423 Update git-local-fetch documentation
18424 Update git-http-fetch documentation
18427 post-receive-email example hook: fastforward should have been fast_forward
18428 post-receive-email example hook: detect rewind-only updates and output sensible message
18429 post-receive-email example hook: sed command for getting description was wrong
18431 Brian Gernhardt (2):
18432 Reverse the order of -b and --track in the man page.
18433 Ignore all man sections as they are generated files.
18436 Documentation/git-reset.txt: suggest git commit --amend in example.
18439 Clarify SubmittingPatches Checklist
18440 git.7: Mention preformatted html doc location
18441 send-email documentation: clarify --smtp-server
18443 Johannes Schindelin (3):
18444 dir.c(common_prefix): Fix two bugs
18445 t4201: Do not display weird characters on the terminal
18446 import-tars: be nice to wrong directory modes
18449 Add clean.requireForce option, and add -f option to git-clean to override it
18450 Fix typo in git-am: s/Was is/Was it/
18451 Create a sysconfdir variable, and use it for ETC_GITCONFIG
18452 Add missing reference to GIT_COMMITTER_DATE in git-commit-tree documentation
18453 Fall back to $EMAIL for missing GIT_AUTHOR_EMAIL and GIT_COMMITTER_EMAIL
18455 Julian Phillips (1):
18456 http.c: Fix problem with repeated calls of http_init
18458 Junio C Hamano (25):
18459 Move index-related variables into a structure.
18460 Make read-cache.c "the_index" free.
18461 Document "diff=driver" attribute
18462 t5302: avoid using tail -c
18463 t6030: grab commit object name as we go
18464 Build RPM with ETC_GITCONFIG=/etc/gitconfig
18465 Diff between two blobs should take mode changes into account now.
18466 t/test-lib.sh: Protect ourselves from common misconfiguration that exports CDPATH to the environment
18467 gitattributes documentation: clarify overriding
18468 applymbox & quiltimport: typofix.
18469 Add 'ident' conversion.
18470 Add 'filter' attribute and external filter driver definition.
18471 Add --date={local,relative,default}
18472 Start preparing for 1.5.1.3
18473 Do not barf on too long action description
18474 Update .mailmap with "Michael"
18475 Fix import-tars fix.
18476 blame -s: suppress author name and time.
18477 Split out mailmap handling out of shortlog
18478 Apply mailmap in git-blame output.
18479 Make macros to prevent double-inclusion in headers consistent.
18480 Make sure test-genrandom and test-chmtime are builtas part of the main build.
18481 Fix symlink handling in git-svn, related to PerlIO
18485 Luiz Fernando N. Capitulino (5):
18486 remove_subtree(): Use strerror() when possible
18487 entry.c: Use const qualifier for 'struct checkout' parameters
18488 read_cache_from(): small simplification
18489 core-tutorial: minor fixes
18490 init_buffer(): Kill buf pointer
18492 Martin Koegler (5):
18493 Add S_IFINVALID mode
18494 add get_sha1_with_mode
18495 add add_object_array_with_mode
18496 store mode in rev_list, if <tree>:<filename> syntax is used
18497 use mode of the tree in git-diff, if <tree>:<file> syntax is used
18499 Michele Ballabio (1):
18500 git shortlog documentation: add long options and fix a typo
18503 add file checkout progress
18505 OGAWA Hirofumi (1):
18506 git-fetch: Fix "argument list too long"
18508 Robin H. Johnson (10):
18509 Document --dry-run parameter to send-email.
18510 Prefix Dry- to the message status to denote dry-runs.
18511 Debugging cleanup improvements
18512 Change the scope of the $cc variable as it is not needed outside of send_message.
18513 Perform correct quoting of recipient names.
18514 Validate @recipients before using it for sendmail and Net::SMTP.
18515 Ensure clean addresses are always used with Net::SMTP
18516 Allow users to optionally specify their envelope sender.
18517 Document --dry-run and envelope-sender for git-send-email.
18518 Sanitize @to recipients.
18521 fast-import: size_t vs ssize_t
18523 Shawn O. Pearce (4):
18524 Don't repack existing objects in fast-import
18525 Actually handle some-low memory conditions
18526 Don't allow empty pathnames in fast-import
18527 Catch empty pathnames in trees during fsck
18529 Uwe Kleine-König (1):
18530 fix importing of subversion tars
18533 Version v1.5.2-rc0; changes since v1.5.1.6:
18534 -------------------------------------------
18537 Fix passing of TCLTK_PATH to git-gui
18538 Fix t4201: accidental arithmetic expansion
18539 Fix permissions on test scripts
18540 Tests for core subproject support
18541 Simplify calling of CR/LF conversion routines
18542 Fix a typo in crlf conversion code
18543 Fix crash in t0020 (crlf conversion)
18545 Alexandre Julliard (1):
18546 git.el: Add a commit description to the reflog.
18549 Add policy on user-interface changes
18552 Show binary file size change in diff --stat
18554 Aneesh Kumar K.V (1):
18555 gitview: annotation support
18557 Brian Gernhardt (2):
18558 Remove unused WITH_OWN_SUBPROCESS_PY from RPM spec
18559 Remove case-sensitive file in t3030-merge-recursive.
18561 Christian Couder (4):
18562 Bisect: teach "bisect start" to optionally use one bad and many good revs.
18563 Documentation: bisect: "start" accepts one bad and many good commits
18564 Bisect: simplify "bisect start" logging.
18565 Bisect: rename "t/t6030-bisect-run.sh" to "t/t6030-bisect-porcelain.sh".
18568 git-svn: bail out on incorrect command-line options
18570 Eygene Ryabinkin (11):
18571 Add the WITH_P4IMPORT knob to the Makefile.
18572 Added git-p4 package to the list of git RPMs.
18573 Added correct Python path to the RPM specfile.
18575 Add --with-tcltk and --without-tcltk to configure.
18576 Rewrite Tcl/Tk interpreter path for the GUI tools.
18577 Eliminate checks of user-specified Tcl/Tk interpreter.
18578 Allow wish interpreter to be defined with TCLTK_PATH
18579 Teach git-gui to use the user-defined UI font everywhere.
18580 Improve look-and-feel of the git-gui tool.
18581 Do not break git-gui messages into multiple lines.
18583 Fernando J. Pereda (1):
18584 Makefile: Add '+' to QUIET_SUBDIR0 to fix parallel make.
18586 Frank Lichtenheld (16):
18587 cvsserver: Introduce new state variable 'method'
18588 cvsserver: Handle three part keys in git config correctly
18589 cvsserver: Allow to override the configuration per access method
18590 cvsserver: Make the database backend configurable
18591 cvsserver: Abort if connect to database fails
18592 Documentation: Replace @@GIT_VERSION@@ in documentation
18593 Documentation: Add version information to man pages
18594 cvsserver: Use DBI->table_info instead of DBI->tables
18595 cvsserver: Corrections to the database backend configuration
18596 cvsserver: Add asciidoc documentation for new database backend configuration
18597 gitweb: Allow forks with project list file
18598 gitweb: Allow configuring the default projects order and add order 'none'
18599 cvsserver: Allow to "add" a removed file
18600 cvsserver: Reword documentation on necessity of write access
18601 cvsserver: Document the GIT branches -> CVS modules mapping more prominently
18602 config.txt: Add gitcvs.db* variables
18604 Jakub Narebski (2):
18605 gitweb: Whitespace cleanup - tabs are for indent, spaces are for align (3)
18606 gitweb: Quote hash keys, and do not use barewords keys
18609 Document git-check-attr
18612 sscanf/strtoul: parse integers robustly
18614 Johannes Schindelin (1):
18615 Use print_wrapped_text() in shortlog
18617 Julian Phillips (1):
18618 refs.c: add a function to sort a ref list, rather then sorting on add
18620 Junio C Hamano (83):
18621 git-fetch: add --quiet
18622 t6002: minor spelling fix.
18623 git-rev-list: add --bisect-vars option.
18624 git-rev-list --bisect: optimization
18625 t6004: add a bit more path optimization test.
18626 rev-list --bisect: Fix "halfway" optimization.
18627 make the previous optimization work also on path-limited rev-list --bisect
18628 Documentation: unbreak user-manual.
18629 Optional Tck/Tk: ignore generated files.
18630 checkout: allow detaching to HEAD even when switching to the tip of a branch
18631 _GIT_INDEX_OUTPUT: allow plumbing to output to an alternative index file.
18632 git-read-tree --index-output=<file>
18633 add_cache_entry(): removal of file foo does not conflict with foo/bar
18634 unpack_trees.c: pass unpack_trees_options structure to keep_entry() as well.
18635 unpack-trees: get rid of *indpos parameter.
18636 Fix read-tree --prefix=dir/.
18637 Fix twoway_merge that passed d/f conflict marker to merged_entry().
18638 Fix switching to a branch with D/F when current branch has file D.
18639 RPM spec: include git-p4 in the list of all packages.
18640 Fix bogus error message from merge-recursive error path
18641 Propagate cache error internal to refresh_cache() via parameter.
18642 Rename internal function "add_file_to_cache" in builtin-update-index.c
18643 Rename static variable write_index to update_index in builtin-apply.c
18644 Rename add_file_to_index() to add_file_to_cache()
18645 git-bisect: modernization
18646 t6030: add a bit more tests to git-bisect
18647 git-bisect: allow bisecting with only one bad commit.
18648 git-push reports the URL after failing.
18649 git-push to multiple locations does not stop at the first failure
18650 A new merge stragety 'subtree'.
18651 Start 1.5.2 cycle by prepareing RelNotes for it.
18652 shortlog -w: make wrap-line behaviour optional.
18653 t1000: fix case table.
18654 Treat D/F conflict entry more carefully in unpack-trees.c::threeway_merge()
18655 merge-recursive: do not barf on "to be removed" entries.
18656 merge-recursive: handle D/F conflict case more carefully.
18657 t3030: merge-recursive backend test.
18658 git-fetch--tool pick-rref
18659 git-fetch: use fetch--tool pick-rref to avoid local fetch from alternate
18660 Add %m to '--pretty=format:'
18661 Refactor patch-id filtering out of git-cherry and git-format-patch.
18662 git-log --cherry-pick A...B
18663 Documentation: --cherry-pick
18664 Fix git {log,show,...} --pretty=email
18665 Add basic infrastructure to assign attributes to paths
18666 Define 'crlf' attribute.
18667 Teach 'diff' about 'diff' attribute.
18668 Fix 'crlf' attribute semantics.
18669 Fix 'diff' attribute semantics.
18670 Makefile: add patch-ids.h back in.
18671 attribute macro support
18672 Define a built-in attribute macro "binary".
18673 Change attribute negation marker from '!' to '-'.
18674 send-email: do not leave an empty CC: line if no cc is present.
18675 Make sure quickfetch is not fooled with a previous, incomplete fetch.
18676 Allow more than true/false to attributes.
18677 merge-recursive: separate out xdl_merge() interface.
18678 git-gui: Honor TCLTK_PATH if supplied
18679 Allow specifying specialized merge-backend per path.
18680 Add a demonstration/test of customized merge.
18681 Update draft release notes for 1.5.2 with accumulated changes.
18682 Custom low-level merge driver support.
18683 Allow the default low-level merge driver to be configured.
18684 Custom low-level merge driver: change the configuration scheme.
18685 Allow low-level driver to specify different behaviour during internal merge.
18686 Fix funny types used in attribute value representation
18687 Counto-fix in merge-recursive
18688 Simplify code to find recursive merge driver.
18689 Documentation: support manual section (5) - file formats.
18690 Update 'crlf' attribute semantics.
18691 Document gitattributes(5)
18692 git-add -u: match the index with working tree.
18693 Fix bogus linked-list management for user defined merge drivers.
18694 convert.c: restructure the attribute checking part.
18695 lockfile: record the primary process.
18696 Update documentation links to point at v1.5.1.2
18697 Documentation/Makefile: fix section (5) installation
18698 Update draft release notes for v1.5.2
18699 pack-objects: quickfix for permission modes.
18700 Fix 'quickfix' on pack-objects.
18701 Update tests not to assume that generated packfiles are writable.
18702 pack-objects: make generated packfile read-only
18703 Support 'diff=pgm' attribute
18705 Linus Torvalds (24):
18706 Optimize directory listing with pathspec limiter.
18707 diff-lib: use ce_mode_from_stat() rather than messing with modes manually
18708 Avoid overflowing name buffer in deep directory structures
18709 Add 'resolve_gitlink_ref()' helper function
18710 Add "S_IFDIRLNK" file mode infrastructure for git links
18711 Teach "fsck" not to follow subproject links
18712 Teach core object handling functions about gitlinks
18713 Fix thinko in subproject entry sorting
18714 Teach directory traversal about subprojects
18715 Teach git-update-index about gitlinks
18716 Don't show gitlink directories when we want "other" files
18717 Teach git list-objects logic not to follow gitlinks
18718 Teach "git-read-tree -u" to check out submodules as a directory
18719 Fix gitlink index entry filesystem matching
18720 Teach git list-objects logic to not follow gitlinks
18721 Teach "git-read-tree -u" to check out submodules as a directory
18722 Fix some "git ls-files -o" fallout from gitlinks
18723 Expose subprojects as special files to "git diff" machinery
18724 Add a generic "object decorator" interface, and make object refs use it
18725 Add support for "commit name decorations" to log family of commands
18726 Use proper object allocators for unknown object nodes too
18727 Clean up object creation to use more common code
18728 Fix working directory errno handling when unlinking a directory
18729 Fix a copy-n-paste bug in the object decorator code.
18731 Luiz Fernando N. Capitulino (2):
18732 ident.c: Use const qualifier for 'struct passwd' parameters
18733 ident.c: Use size_t (instead of int) to store sizes
18735 Martin Koegler (1):
18736 gitweb: Show "no difference" message for empty diff
18738 Michael S. Tsirkin (1):
18739 Display the subject of the commit just made.
18741 Nicolas Pitre (32):
18742 clean up and optimize nth_packed_object_sha1() usage
18743 get rid of num_packed_objects()
18744 make overflow test on delta base offset work regardless of variable size
18745 add overflow tests on pack offset variables
18746 compute a CRC32 for each object as stored in a pack
18747 compute object CRC32 with index-pack
18748 pack-objects: learn about pack index version 2
18749 index-pack: learn about pack index version 2
18750 sha1_file.c: learn about index version 2
18751 show-index.c: learn about index v2
18752 pack-redundant.c: learn about index v2
18753 allow forcing index v2 and 64-bit offset treshold
18754 validate reused pack data with CRC when possible
18755 simple random data generator for tests
18756 use test-genrandom in tests instead of /dev/urandom
18757 tests for various pack index features
18758 clean up add_object_entry()
18759 pack-objects: optimize preferred base handling a bit
18760 pack-objects: equal objects in size should delta against newer objects
18761 pack-objects: rework check_delta_limit usage
18762 pack-objects: clean up list sorting
18763 pack-objects: get rid of reuse_cached_pack
18764 pack-objects: get rid of create_final_object_list()
18765 pack-objects: make in_pack_header_size a variable of its own
18766 add get_size_from_delta()
18767 pack-objects: better check_object() performances
18768 pack-objects: remove obsolete comments
18769 document --index-version for index-pack and pack-objects
18770 common progress display support
18771 make progress "title" part of the common progress interface
18772 provide a facility for "delayed" progress reporting
18773 delay progress display when checking out files
18776 git-archive: make tar the default format
18778 Robin H. Johnson (2):
18779 Add custom subject prefix support to format-patch (take 3)
18780 Add testcase for format-patch --subject-prefix (take 3)
18782 Shawn O. Pearce (8):
18783 Always bind the return key to the default button
18784 Fix lost-found to show commits only referenced by reflogs
18785 Don't yap about merge-subtree during make
18786 git-gui: Display the directory basename in the title
18787 Revert "Allow wish interpreter to be defined with TCLTK_PATH"
18788 Contribute a fairly paranoid update hook
18789 Kill the useless progress meter in merge-recursive
18790 Cleanup variables in cat-file
18793 Add --quiet option to suppress output of "rm" commands for removed files.
18794 git-rm: Trivial fix for a comment typo.
18795 Add --ignore-unmatch option to exit with zero status when no files are removed.
18797 Xavier Maillard (2):
18798 git-blame.el: separate git-blame-mode to ease maintenance
18799 git-blame.el: pick a set of random colors for each git-blame turn
18802 Version v1.5.1.6; changes since v1.5.1.5:
18803 -----------------------------------------
18806 git-svn: avoid crashing svnserve when creating new directories
18807 git-svn: don't minimize-url when doing an init that tracks multiple paths
18809 J. Bruce Fields (4):
18810 tutorials: add user-manual links
18811 tutorial: revise index introduction
18812 user-manual: discourage shared repository
18813 user-manual: finding commits referencing given file content
18816 user-manual: Add section on ignoring files
18818 Junio C Hamano (1):
18821 Matthias Kestenholz (2):
18822 Documentation: Added [verse] to SYNOPSIS where necessary
18823 Documentation: Reformatted SYNOPSIS for several commands
18826 Version v1.5.1.5; changes since v1.5.1.4:
18827 -----------------------------------------
18830 Allow fetching references from any namespace
18832 Andy Whitcroft (1):
18833 git name-rev writes beyond the end of malloc() with large generations
18836 git-svn: don't drop the username from URLs when dcommit is run
18837 git-svn: clean up caching of SVN::Ra functions
18838 git-svn: fix segfaults due to initial SVN pool being cleared
18839 git-svn: don't attempt to minimize URLs by default
18841 Frank Lichtenheld (3):
18842 builtin-log.c: Fix typo in comment
18843 Documentation: format-patch has no --mbox option
18844 git-am: Clean up the asciidoc documentation
18846 J. Bruce Fields (10):
18847 user-manual: revise birdseye-view chapter
18848 glossary: expand and clarify some definitions, prune cross-references
18849 user-manual: move quick-start to an appendix
18850 Documentation: remove howto's now incorporated into manual
18851 user-manual: move howto/make-dist.txt into user manual
18852 user-manual: move howto/using-topic-branches into manual
18853 user-manual: add a "counting commits" example
18854 user-manual: introduce git
18855 user-manual: listing commits reachable from some refs not others
18856 user-manual: reorganize public git repo discussion
18858 Jakub Narebski (1):
18859 gitweb: Add a few comments about %feature hash
18862 Updated documentation of hooks in git-receive-pack.
18865 SPECIFYING RANGES typo fix: it it => it is
18868 format-patch: add MIME-Version header when we add content-type.
18870 Johannes Schindelin (2):
18871 import-tars: Use the "Link indicator" to identify directories
18872 Add a birdview-on-the-source-code section to the user manual
18874 Junio C Hamano (7):
18875 git-clone: don't get fooled by $PWD
18876 .mailmap: add some aliases
18877 checkout: allow detaching to HEAD even when switching to the tip of a branch
18878 git-config: do not forget seeing "a.b.var" means we are out of "a.var" section.
18879 Fix git-clone buglet for remote case.
18880 Prepare for 1.5.1.5 Release Notes
18883 Marco Costalba (1):
18884 Fix an unmatched comment end in arm/sha1_arm.S
18886 Matthieu Castet (1):
18887 Remove stale non-static-inline prototype for tree_entry_extract()
18889 Michael Hendricks (2):
18890 git-send-email: allow leading white space on mutt aliases
18891 Document core.excludesfile for git-add
18894 Documentation: git-rev-list's "patterns"
18897 RPM spec: include files in technical/ to package.
18898 Documentation/branch: fix small typo in -D example
18900 Richard P. Curnow (2):
18901 Fix documentation of tag in git-fast-import.txt
18902 Fix documentation of tag in git-fast-import.txt
18904 Shawn O. Pearce (1):
18905 Properly handle '0' filenames in import-tars
18907 Steffen Prohaska (3):
18908 tiny fix in documentation of git-clone
18909 git-config: test for 'do not forget "a.b.var" ends "a.var" section'.
18910 Fixed link in user-manual
18913 Version v1.5.1.4; changes since v1.5.1.3:
18914 -----------------------------------------
18917 Small correction in reading of commit headers
18919 Alexandre Julliard (1):
18920 http-fetch: Disable use of curl multi support for libcurl < 7.16.
18922 Amos Waterland (1):
18923 wcwidth redeclaration
18925 Arjen Laarhoven (1):
18926 Document 'opendiff' value in config.txt and git-mergetool.txt
18929 Allow PERL_PATH="/usr/bin/env perl"
18930 posix compatibility for t4200
18933 Mention version 1.5.1 in tutorial and user-manual
18935 Daniel Barkalow (1):
18936 Make xstrndup common
18938 Frank Lichtenheld (1):
18939 cvsserver: Handle re-added files correctly
18941 J. Bruce Fields (7):
18942 user-manual: more discussion of detached heads, fix typos
18943 user-manual: add section ID's
18944 user-manual: clean up fast-forward and dangling-objects sections
18945 user-manual: fix .gitconfig editing examples
18946 user-manual: miscellaneous editing
18947 user-manual: stop deprecating the manual
18948 user-manual: fix clone and fetch typos
18950 Jakub Narebski (1):
18951 diff format documentation: describe raw combined diff format
18954 Documentation: fix typo in git-remote.txt
18957 Documentation: don't reference non-existent 'git-cvsapplycommit'
18959 Johannes Schindelin (1):
18960 Teach import-tars about GNU tar's @LongLink extension.
18962 Junio C Hamano (5):
18963 diff.c: fix "size cache" handling.
18964 blame: Notice a wholesale incorporation of an existing file.
18966 Add test for blame corner cases.
18969 Karl Hasselström (2):
18970 Fix markup in git-svn man page
18971 Add --no-rebase option to git-svn dcommit
18973 Linus Torvalds (1):
18974 Fix --boundary output
18976 Martin Koegler (1):
18977 Fix compilation of test-delta
18979 Paul Mackerras (1):
18980 gitk: Allow user to choose whether to see the diff, old file, or new file
18983 Add howto files to rpm packages.
18985 Shawn O. Pearce (1):
18986 git-gui: Allow spaces in path to 'wish'
18989 gitweb: use decode_utf8 directly
18992 Version v1.5.1.3; changes since v1.5.1.2:
18993 -----------------------------------------
18996 Remove usernames from all commit messages, not just when using svmprops
18997 git-svn: Don't rely on $_ after making a function call
18998 git-svn: Ignore usernames in URLs in find_by_url
18999 git-svn: Added 'find-rev' command
19000 git-svn: Add 'find-rev' command
19003 Fix handle leak in write_tree
19006 Removing -n option from git-diff-files documentation
19007 Document additional options for git-fetch
19008 Update git-fmt-merge documentation
19009 Update git-grep documentation
19010 Update -L documentation for git-blame/git-annotate
19011 Update git-http-push documentation
19012 Update git-local-fetch documentation
19013 Update git-http-fetch documentation
19015 Brian Gernhardt (2):
19016 Reverse the order of -b and --track in the man page.
19017 Ignore all man sections as they are generated files.
19020 Documentation/git-reset.txt: suggest git commit --amend in example.
19023 Clarify SubmittingPatches Checklist
19024 git.7: Mention preformatted html doc location
19025 send-email documentation: clarify --smtp-server
19027 Johannes Schindelin (2):
19028 dir.c(common_prefix): Fix two bugs
19029 import-tars: be nice to wrong directory modes
19032 Fix typo in git-am: s/Was is/Was it/
19033 Create a sysconfdir variable, and use it for ETC_GITCONFIG
19034 Add missing reference to GIT_COMMITTER_DATE in git-commit-tree documentation
19036 Julian Phillips (1):
19037 http.c: Fix problem with repeated calls of http_init
19039 Junio C Hamano (8):
19040 Build RPM with ETC_GITCONFIG=/etc/gitconfig
19041 applymbox & quiltimport: typofix.
19042 Start preparing for 1.5.1.3
19043 Do not barf on too long action description
19044 Update .mailmap with "Michael"
19045 Fix import-tars fix.
19046 Fix symlink handling in git-svn, related to PerlIO
19049 Michele Ballabio (1):
19050 git shortlog documentation: add long options and fix a typo
19052 Robin H. Johnson (10):
19053 Document --dry-run parameter to send-email.
19054 Prefix Dry- to the message status to denote dry-runs.
19055 Debugging cleanup improvements
19056 Change the scope of the $cc variable as it is not needed outside of send_message.
19057 Perform correct quoting of recipient names.
19058 Validate @recipients before using it for sendmail and Net::SMTP.
19059 Ensure clean addresses are always used with Net::SMTP
19060 Allow users to optionally specify their envelope sender.
19061 Document --dry-run and envelope-sender for git-send-email.
19062 Sanitize @to recipients.
19064 Shawn O. Pearce (3):
19065 Actually handle some-low memory conditions
19066 Don't allow empty pathnames in fast-import
19067 Catch empty pathnames in trees during fsck
19070 Version v1.5.1.2; changes since v1.5.1.1:
19071 -----------------------------------------
19074 Use rev-list --reverse in git-rebase.sh
19075 Document -g (--walk-reflogs) option of git-log
19076 Fix overwriting of files when applying contextually independent diffs
19079 Update git-am documentation
19080 Update git-applymbox documentation
19081 Update git-apply documentation
19082 Update git-annotate/git-blame documentation
19083 Update git-archive documentation
19084 Update git-cherry-pick documentation
19085 Fix unmatched emphasis tag in git-tutorial
19086 Update git-config documentation
19088 Andy Whitcroft (1):
19089 fix up strtoul_ui error handling
19092 Use const qualifier for 'sha1' parameter in delete_ref function
19095 git-svn: respect lower bound of -r/--revision when following parent
19096 git-svn: quiet some warnings when run only with --version/--help
19097 git-svn: don't allow globs to match regular files
19098 perl: install private Error.pm if the site version is older than our own
19100 Eygene Ryabinkin (2):
19101 Teach gitk to use the user-defined UI font everywhere.
19102 Improve look-and-feel of the gitk tool.
19104 Frank Lichtenheld (5):
19105 config.txt: Document gitcvs.allbinary
19106 config.txt: Document core.autocrlf
19107 config.txt: Change pserver to server in description of gitcvs.*
19108 config.txt: Fix grammatical error in description of http.noEPSV
19109 git-shortlog: Fix two formatting errors in asciidoc documentation
19112 variable $projectdesc needs to be set before checking against unchanged default.
19113 Have sample update hook not refuse deleting a branch through push.
19115 J. Bruce Fields (7):
19116 Documentation: minor edits of git-lost-found manpage
19117 Documentation: clarify git-checkout -f, minor editing
19118 Documentation: clarify track/no-track option.
19119 user-manual: fix discussion of default clone
19120 user-manual: detached HEAD
19121 user-manual: start revising "internals" chapter
19122 user-manual: use detached head when rewriting history
19125 sscanf/strtoul: parse integers robustly
19127 Junio C Hamano (4):
19128 Do not default to --no-index when given two directories.
19129 Start preparing for 1.5.1.2
19130 git-clone: fix dumb protocol transport to clone from pack-pruned ref
19133 Linus Torvalds (1):
19134 git-quiltimport complaining yet still working
19136 Matthias Lederhofer (1):
19137 handle_options in git wrapper miscounts the options it handled.
19140 git-blame: Fix overrun in fake_working_tree_commit()
19143 git-tar-tree: complete deprecation conversion message
19145 Shawn O. Pearce (1):
19146 git-gui: Brown paper bag fix division by 0 in blame
19149 Version v1.5.1.1; changes since v1.5.1:
19150 ---------------------------------------
19152 Arjen Laarhoven (4):
19153 usermanual.txt: some capitalization nits
19154 t3200-branch.sh: small language nit
19155 t5300-pack-object.sh: portability issue using /usr/bin/stat
19156 Makefile: iconv() on Darwin has the old interface
19158 Brian Gernhardt (3):
19159 Fix t4200-rerere for white-space from "wc -l"
19160 Document --left-right option to rev-list.
19161 Distinguish branches by more than case in tests.
19164 Fix lseek(2) calls with args 2 and 3 swapped
19167 git-svn: bail out on incorrect command-line options
19168 git-svn: dcommit/rebase confused by patches with git-svn-id: lines
19169 git-svn: fix log command to avoid infinite loop on long commit messages
19171 Frank Lichtenheld (7):
19172 cvsimport: sync usage lines with existing options
19173 cvsimport: Improve documentation of CVSROOT and CVS module determination
19174 cvsimport: Improve usage error reporting
19175 cvsimport: Reorder options in documentation for better understanding
19176 cvsimport: Improve formating consistency
19177 cvsserver: small corrections to asciidoc documentation
19178 cvsserver: Fix handling of diappeared files on update
19181 Fix renaming branch without config file
19184 rename contrib/hooks/post-receieve-email to contrib/hooks/post-receive-email.
19186 Jakub Narebski (1):
19187 gitweb: Fix bug in "blobdiff" view for split (e.g. file to symlink) patches
19190 (encode_85, decode_85): Mark source buffer pointer as "const".
19192 Julian Phillips (1):
19193 Documentation: show-ref: document --exclude-existing
19195 Junio C Hamano (7):
19196 rerere: make sorting really stable.
19197 Fix dependency of common-cmds.h
19198 Documentation: tighten dependency for git.{html,txt}
19199 Prepare for 1.5.1.1
19200 Add Documentation/cmd-list.made to .gitignore
19201 fsck: do not complain on detached HEAD.
19205 rename_ref(): only print a warning when config-file update fails
19206 Make builtin-branch.c handle the git config file
19209 Revert "builtin-archive: use RUN_SETUP"
19211 Shawn O. Pearce (1):
19212 Honor -p<n> when applying git diffs
19214 Tomash Brechko (1):
19215 cvsexportcommit -p : fix the usage of git-apply -C.
19218 DESTDIR support for git/contrib/emacs
19220 YOSHIFUJI Hideaki (1):
19221 Avoid composing too long "References" header.
19224 Version v1.5.1; changes since v1.5.1-rc3:
19225 -----------------------------------------
19228 Keep rename/rename conflicts of intermediate merges while doing recursive merge
19231 Reimplement emailing part of hooks--update in contrib/hooks/post-receive-email
19233 Christian Couder (1):
19234 Bisect: Improve error message in "bisect_next_check".
19237 git-mailinfo fixes for patch munging
19240 git-svn: avoid respewing similar error messages for missing paths
19241 git-svn: fail on rebase if we are unable to find a ref to rebase against
19244 git-quiltimport /bin/sh-ism fix
19246 Frank Lichtenheld (1):
19247 cvsserver: Don't lie about binary mode in asciidoc documentation
19250 Documentation/git-svnimport.txt: fix typo.
19251 Documentation/git-rev-parse.txt: fix example in SPECIFYING RANGES.
19253 H. Peter Anvin (1):
19254 git-upload-pack: make sure we close unused pipe ends
19256 Jakub Narebski (2):
19257 gitweb: Support comparing blobs (files) with different names
19258 Documentation: A few minor fixes to Git User's Manual
19260 Julian Phillips (1):
19261 contrib/workdir: add a simple script to create a working directory
19263 Junio C Hamano (6):
19264 Update draft release notes for 1.5.1
19265 Do not bother documenting fetch--tool
19266 Hopefully final update to the draft Release Notes, preparing for 1.5.1
19267 rerere should not repeat the earlier hunks in later ones
19272 Plug memory leak in index-pack collision checking codepath.
19274 Theodore Ts'o (12):
19275 Fix minor formatting issue in man page for git-mergetool
19276 mergetool: Replace use of "echo -n" with printf(1) to be more portable
19277 mergetool: Don't error out in the merge case where the local file is deleted
19278 mergetool: portability fix: don't assume true is in /bin
19279 mergetool: portability fix: don't use reserved word function
19280 mergetool: factor out common code
19281 mergetool: Remove spurious error message if merge.tool config option not set
19282 mergetool: Fix abort command when resolving symlinks and deleted files
19283 mergetool: Add support for Apple Mac OS X's opendiff command
19284 mergetool: Make git-rm quiet when resolving a deleted file conflict
19285 mergetool: Clean up description of files and prompts for merge resolutions
19286 Rename warn() to warning() to fix symbol conflicts on BSD and Mac OS
19289 Version v1.5.1-rc3; changes since v1.5.1-rc2:
19290 ---------------------------------------------
19292 Alexandre Julliard (1):
19293 git.el: Display some information about the HEAD commit.
19295 Christian Couder (2):
19296 Bisect: Use "git-show-ref --verify" when reseting.
19297 Bisect: add checks at the beginning of "git bisect run".
19300 Makefile: remove test-chmtime program in target clean.
19301 http-fetch: don't use double-slash as directory separator in URLs
19302 http-fetch: remove path_len from struct alt_base, it was computed but never used
19304 H. Peter Anvin (1):
19305 git-upload-pack: make sure we close unused pipe ends
19307 Jakub Narebski (2):
19308 gitweb: Add example of config file and how to generate projects list to gitweb/INSTALL
19309 gitweb: Cleanup and uniquify die_error calls
19312 read-tree: use xcalloc
19313 use xrealloc in help.c
19316 git-rm: don't remove newly added file without -f
19317 --pretty=format: fix broken %ct and %at interpolation
19318 Add some basic tests of rev-list --pretty=format
19319 Fix "--pretty=format:" encoding item
19320 t/t6006: add tests for a slightly more complex commit messages
19321 commit: fix pretty-printing of messages with "\nencoding "
19324 sha1_file.c (write_sha1_from_fd): Detect close failure.
19326 Johannes Schindelin (1):
19327 t4118: be nice to non-GNU sed
19329 Junio C Hamano (7):
19330 Document git-log --first-parent
19331 sha1_file.c (write_sha1_file): Detect close failure
19332 git-commit: "read-tree -m HEAD" is not the right way to read-tree quickly
19333 Fix "--pretty=format:" for parent related items.
19335 Update main git.html page to point at 1.5.0.6 documentation
19338 Linus Torvalds (1):
19339 Fix "getaddrinfo()" buglet
19342 Version v1.5.1-rc2; changes since v1.5.1-rc1:
19343 ---------------------------------------------
19346 Document --quiet option to git-diff
19347 Use diff* with --exit-code in git-am, git-rebase and git-merge-ours
19350 update-hook: abort early if the project description is unset
19351 update-hook: remove e-mail sending hook.
19354 prefer "git COMMAND" over "git-COMMAND" in gitk
19357 make git clone -q suppress the noise with http fetch
19359 Christian Couder (6):
19360 Bisect: implement "git bisect run <cmd>..." to automatically bisect.
19361 Documentation: bisect: reformat some paragraphs.
19362 Documentation: bisect: reword one paragraph.
19363 Documentation: bisect: reformat more paragraphs.
19364 Documentation: bisect: add some titles to some paragraphs.
19365 Documentation: bisect: make a comment fit better in the man page.
19368 gitk: bind <F5> key to Update (reread commits)
19369 git-svn: fix rel_path() when not connected to the repository root
19371 J. Bruce Fields (5):
19372 user-manual: run xsltproc without --nonet option
19373 user-manual: Use def_ instead of ref_ for glossary references.
19374 glossary: stop generating automatically
19375 glossary: clean up cross-references
19376 user-manual: introduce "branch" and "branch head" differently
19378 Jakub Narebski (4):
19379 gitweb: Fix "next" link in commit view
19380 gitweb: Don't escape attributes in CGI.pm HTML methods
19381 gitweb: Fix not marking signoff lines in "log" view
19382 gitweb: Add some installation notes in gitweb/INSTALL
19385 Replace remaining instances of strdup with xstrdup.
19386 use xmalloc in git.c and help.c
19389 user-manual.txt: fix a tiny typo.
19391 Johannes Schindelin (5):
19392 xdiff/xutils.c(xdl_hash_record): factor out whitespace handling
19393 Add a HOWTO for setting up a standalone git daemon
19394 Provide some technical documentation for shallow clones
19395 t4118: be nice to non-GNU sed
19396 git-revert: Revert revert message to old behaviour
19399 Teach git-remote to list pushed branches.
19401 Junio C Hamano (15):
19402 git-log --first-parent: show only the first parent log
19403 blame: micro-optimize cmp_suspect()
19404 blame: cmp_suspect is not "cmp" anymore.
19405 Teach tree_entry_interesting() that the tree entries are sorted.
19406 tree-diff: avoid strncmp()
19407 tree_entry_interesting(): allow it to say "everything is interesting"
19408 git-rebase: make 'rebase HEAD branch' work as expected.
19409 git-apply: Do not free the wrong buffer when we convert the data for writeout
19410 checkout: report where the new HEAD is upon detaching HEAD
19411 git-bisect: typofix
19412 git-bisect.sh: properly dq $GIT_DIR
19413 Fix path-limited "rev-list --bisect" termination condition.
19414 git-am documentation: describe what is taken from where.
19415 Update README to point at a few key periodical messages to the list
19419 gitweb: Change to use explicitly function call cgi->escapHTML()
19421 Linus Torvalds (6):
19422 Fix loose object uncompression check.
19423 Don't ever return corrupt objects from "parse_object()"
19424 Be more careful about zlib return values
19425 Remove "pathlen" from "struct name_entry"
19426 Initialize tree descriptors with a helper function rather than by hand.
19427 Switch over tree descriptors to contain a pre-parsed entry
19429 Michael S. Tsirkin (2):
19430 fix typo in git-am manpage
19431 git-merge: Put FETCH_HEAD data in merge commit message
19433 Nicolas Pitre (10):
19434 clean up the delta base cache size a bit
19435 use a LRU eviction policy for the delta base cache
19436 don't ever allow SHA1 collisions to exist by fetching a pack
19437 index-pack: use hash_sha1_file()
19438 index-pack: more validation checks and cleanups
19439 improve checkout message when asking for same branch
19440 minor git-prune optimization
19441 update HEAD reflog when branch pointed to by HEAD is directly modified
19442 make it more obvious that temporary files are temporary files
19443 write_sha1_from_fd() should make new objects read-only
19446 Documentation/pack-format.txt: Clear up description of types.
19449 git-fetch: Fix single_force in append_fetch_head
19451 Shawn O. Pearce (1):
19452 contrib/continuous: a continuous integration build manager
19454 Uwe Kleine-König (1):
19455 Bisect: convert revs given to good and bad to commits
19458 Version v1.5.1-rc1; changes since v1.5.0.7:
19459 -------------------------------------------
19462 disable t4016-diff-quote.sh on some filesystems
19463 git-gui: Support of "make -s" in: do not output anything of the build itself
19464 More build output cleaning up
19465 Support of "make -s": do not output anything of the build itself
19466 Allow "make -w" generate its usual output
19467 Allow git-diff exit with codes similar to diff(1)
19468 Add tests for --quiet option of diff programs
19470 Alexandre Julliard (1):
19471 git.el: Add support for commit hooks.
19474 Only show log entries for new revisions in hooks--update
19475 Have git-cvsserver call hooks/update before really altering the ref
19476 The "table-of-contents" in the update hook script should match the body
19477 cvsserver: Remove trailing "\n" from commithash in checkin function
19478 cvsserver: Make always-binary mode a config file option
19479 Sample update hook: typofix and modernization to use "git log"
19480 update-hook: fix incorrect use of git-describe and sed for finding previous tag
19482 Aneesh Kumar K.V (1):
19483 Documentation: document remote.<name>.tagopt
19486 git-send-email: configurable bcc and chain-reply-to
19489 builtin-mailinfo.c infrastrcture changes
19490 restrict the patch filtering
19491 Add a couple more test cases to the suite.
19494 git-svn: move authentication prompts into their own namespace
19495 git-svn: cleanup: move process_rm around
19496 git-svn: cleanup: put SVN workarounds into their own namespace
19497 git-svn: cleanup: avoid re-use()ing Git.pm in sub-packages
19498 git-svn: add Git::SVN module (to avoid global variables)
19499 git-svn: convert 'init' to use Git::SVN
19500 git-svn: convert multi-init over to using Git::SVN
19501 git-svn: make multi-init capable of reusing the Ra connection
19502 git-svn: add a test for show-ignore
19503 git-svn: convert show-ignore over to Git::SVN
19504 git-svn: moved the 'log' command into its own namespace
19505 git-svn: port the 'rebuild' command to use Git::SVN objects
19506 git-svn: do not let Git.pm warn if we prematurely close pipes
19507 git-svn: convert the 'commit-diff' command to Git::SVN
19508 git-svn: get rid of Memoize for now...
19509 git-svn: fetch/multi-fetch converted over to Git::SVN module
19510 git-svn: switch dcommit to using Git::SVN code
19511 git-svn: convert 'set-tree' command to use Git::SVN
19512 git-svn: remove graft-branches command
19513 git-svn: add support for metadata in .git/config
19514 git-svn: fix a regression in dcommit that caused empty log messages
19515 git-svn: reuse open SVN::Ra connections by URL
19516 git-svn: enable --minimize to simplify the config and connections
19517 git-svn: fix --follow-parent to work with Git::SVN
19518 git-svn: --follow-parent works with svn-remotes multiple branches
19519 git-svn: disallow ambigious local refspecs
19520 git-svn: allow --follow-parent on deleted directories
19521 git-svn: get rid of additional fetch-arguments
19522 git-svn: allow 'init' to work outside of tests
19523 git-svn: better error reporting if --follow-parent fails
19524 git-svn: 'init' attempts to connect to the repository root if possible
19525 git-svn: --follow-parent now works on sub-directories of larger branches
19526 git-svn: track writes writes to the index in fetch
19527 git-svn: add an odd test case that seems to cause segfaults over HTTP
19528 git-svn: avoid tracking change-less revisions
19529 git-svn: correctly track revisions made to deleted branches
19530 git-svn: fix segfaults from accessing svn_log_changed_path_t
19531 git-svn: fix committing to subdirectories, add tests
19532 git-svn: avoid an extra svn_ra connection during commits
19533 git-svn: simplify usage of the SVN::Git::Editor interface
19534 git-svn: cleanup remove unused function
19535 git-svn: allow multi-fetch to fetch things chronologically
19536 git-svn: correctly track diff-less copies with do_switch
19537 git-svn: correctly handle do_{switch,update} in deep directories
19538 git-svn: stop using path names as refnames with --follow-parent
19539 git-svn: cleanup: move editor-specific variables into the editor namespace
19540 git-svn: just use Digest::MD5 instead of requiring it
19541 git-svn: reinstate the default SVN error handler after using get_log
19542 git-svn: don't rely on do_switch + reparenting with svn(+ssh)://
19543 git-svn: fetch tracks initial change with --follow-parent
19544 git-svn: remove the 'rebuild' command and make the functionality automatic
19545 git-svn: fix several fetch bugs related to repeated invocations
19546 git-svn: reinstate --no-metadata, add --svn-remote=, variable cleanups
19547 git-svn: gracefully handle --follow-parent failures
19548 git-svn: make (multi-)fetch safer but slower
19549 git-svn: avoid a huge memory spike with high-numbered revisions
19550 git-svn: re-enable repacking flags
19551 git-svn: do our best to ensure that our ref and rev_db are consistent
19552 git-svn: avoid redundant get_log calls between invocations
19553 git-svn: use sys* IO functions for reading rev_db
19554 git-svn: don't write to the config file from --follow-parent
19555 git-svn: save paths to tags/branches with for future reuse
19556 git-svn: migrations default to [svn-remote "git-svn"]
19557 git-svn: get rid of revisions_eq check for --follow-parent
19558 git-svn: avoid extra get_log calls when refspecs are added for fetching
19559 git-svn: just name the default svn-remote "svn" instead of "git-svn"
19560 git-svn: prepare multi-init for wildcard support
19561 git-svn: reintroduce using a single get_log() to fetch
19562 git-svn: run get_log() on a sub-directory if possible
19563 git-svn: implement auto-discovery of branches/tags
19564 git-svn: --follow-parent tracks multi-parent paths
19565 git-svn: remove check_path calls before calling do_update
19566 git-svn: remove some noisy debugging messages
19567 git-svn: enable follow-parent functionality by default
19568 git-svn: fix buggy regular expression usage in several places
19569 git-svn: correctly handle the -q flag in SVN::Git::Fetcher
19570 git-svn: correctly handle globs with a right-hand-side path component
19571 git-svn: remove optimized commit stuff for set-tree
19572 git-svn: add support for SVN::Mirror/svk using revprops for metadata
19573 git-svn: add support for per-[svn-remote "..."] options
19574 git-svn: use private $GIT_DIR/svn/config file more
19575 git-svn: extra safety for noMetadata and useSvmProps users
19576 git-svn: use separate, per-repository .rev_db files
19577 git-svn: write the highest maxRex out for branches and tags
19578 git-svn: handle multi-init without --trunk, UseSvmProps fixes
19579 git-svn: make dcommit usable for glob users
19580 git-svn: include merges when calling rev-list for decommit
19581 git-svn: usability fixes for the 'git svn log' command
19582 t910*: s/repo-config/config/g; poke around possible race conditions
19583 git-svn: hopefully make 'fetch' more user-friendly
19584 git-svn: allow 'init' to act as multi-init
19585 git-svn: brown paper bag fixes
19586 git-svn: simplify the (multi-)init methods of fetching
19587 git-svn: allow --log-window-size to be specified, default to 100
19588 git-svn: remember to check for clean indices on globbed refs, too
19589 git-svn: error checking for invalid [svn-remote "..."] sections
19590 git-svn: allow dcommit for those who only fetch from SVM with useSvmProps
19591 git-svn: documentation updates for new functionality
19592 git-svn: add support for --stat in the log command
19593 git-svn: checkout files on new fetches
19594 git-svn: add a 'rebase' command
19595 git-svn: fix some issues for people migrating from older versions
19596 git-svn: hide the private git-svn 'config' file as '.metadata'
19597 git-svn: add 'clone' command, an alias for init + fetch
19598 git-svn: allow overriding of the SVN repo root in metadata
19599 git-svn: add support for using svnsync properties
19600 git-svn: fix useSvmProps, hopefully for the last time
19601 git-svn: add test for useSvnsyncProps
19602 git-svn: documentation updates
19603 git-svn: allow metadata options to be specified with 'init' and 'clone'
19604 git-svn: give show-ignore HEAD smarts, like dcommit and log
19605 git-svn: ensure we're at the top-level and can access $GIT_DIR
19606 git-svn: fix clone when a target directory has been specified
19607 git-svn: fix reconnections to different paths of svn:// repositories
19608 git-svn: fix some potential bugs with --follow-parent
19609 Add test-chmtime: a utility to change mtime on files
19610 Update tests to use test-chmtime
19611 git-svn: fix show-ignore when not connected to the repository root
19612 git-svn: add -l/--local command to "git svn rebase"
19614 Frank Lichtenheld (3):
19615 cvsserver: Use Merged response instead of Update-existing for merged files
19616 cvsserver: Be more chatty
19617 cvsserver: further improve messages on commit and status
19619 Fredrik Kuivinen (1):
19620 New autoconf test for iconv
19622 J. Bruce Fields (1):
19623 Make git-send-email aware of Cc: lines.
19625 Jakub Narebski (1):
19626 gitweb: Don't escape attributes in CGI.pm HTML methods
19629 add: Support specifying an excludes file with a configuration variable
19631 mergetool: Add support for vimdiff.
19634 New fast-import test case for valid tree sorting
19637 I like the idea of the new ':/<oneline prefix>' notation, and gave it a try, but all I could get was a segfault. It was dereferencing a NULL commit list. Fix below. With it, this example now works:
19638 git-grep: don't use sscanf
19640 Johannes Schindelin (42):
19641 Teach revision machinery about --reverse
19642 teach diff machinery about --ignore-space-at-eol
19643 name-rev: introduce the --refs=<pattern> option
19644 diff --check: use colour
19645 apply: fix memory leak in prefix_one()
19646 name-rev: avoid "^0" when unneeded
19647 rev-list --max-age, --max-count: support --boundary
19648 fetch & clone: do not output progress when not on a tty
19649 config: read system-wide defaults from /etc/gitconfig
19650 git grep: use pager
19651 Teach diff -B about colours
19652 apply: make --verbose a little more useful
19653 Teach git-diff-files the new option `--no-index`
19654 pretty-formats: add 'format:<string>'
19655 Make tests independent of global config files
19656 Add git-bundle: move objects and references by archive
19657 git-bundle: assorted fixes
19658 git-bundle: avoid fork() in verify_bundle()
19659 git-bundle: fix 'create --all'
19660 git-bundle: record commit summary in the prerequisite data
19661 Fixup no-progress for fetch & clone
19662 object name: introduce ':/<oneline prefix>' notation
19663 Fix typo: do not show name1 when name2 fails
19664 diff --no-index: also imitate the exit status of diff(1)
19665 Actually make print_wrapped_text() useful
19666 show_date(): rename the "relative" parameter to "mode"
19667 diff: make more cases implicit --no-index
19668 print_wrapped_text: fix output for negative indent
19669 Make git-revert & git-cherry-pick a builtin
19670 diff: support reading a file from stdin via "-"
19671 diff --no-index: support /dev/null as filename
19672 Get rid of the dependency to GNU diff in the tests
19673 cherry-pick: Suggest a better method to retain authorship
19674 format-patch: add --inline option and make --attach a true attachment
19675 bundle: fix wrong check of read_header()'s return value & add tests
19676 git-bundle: avoid packing objects which are in the prerequisites
19677 git-bundle: Make thin packs
19678 git-bundle: handle thin packs in subcommand "unbundle"
19679 git-bundle: die if a given ref is not included in bundle
19680 git-bundle: prevent overwriting existing bundles
19681 git-bundle: only die if pack would be empty, warn if ref is skipped
19682 Do not output "GEN " when generating perl.mak
19685 Add core.symlinks to mark filesystems that do not support symbolic links.
19686 Handle core.symlinks=false case in merge-recursive.
19687 Tell multi-parent diff about core.symlinks.
19689 Julian Phillips (5):
19690 Allow fetch--tool to read from stdin
19691 Use stdin reflist passing in parse-remote
19692 Use stdin reflist passing in git-fetch.sh
19693 git-branch: improve abbreviation of sha1s in verbose mode
19694 git-branch: document new --no-abbrev option
19696 Junio C Hamano (80):
19697 git-diff/git-apply: make diff output a bit friendlier to GNU patch (part 2)
19698 Make merge-base a built-in.
19699 Allow in_merge_bases() to take more than one reference commits.
19700 Remove git-resolve.
19701 Remove git-diff-stages.
19702 Add link to v1.5.0 documentation.
19703 blame: --show-stats for easier optimization work.
19704 git-fetch: split fetch_main into fetch_dumb and fetch_native
19705 git-fetch--tool: start rewriting parts of git-fetch in C.
19706 git-fetch: move more code into C.
19707 git-fetch: rewrite another shell loop in C
19708 git-fetch: rewrite expand_ref_wildcard in C
19709 Document --ignore-space-at-eol option.
19711 Point top-level RelNotes link at 1.5.1 release notes being prepared.
19712 t0020: add test for auto-crlf
19713 remotes.not-origin.tagopt
19714 Teach 'git apply' to look at $GIT_DIR/config
19715 Teach core.autocrlf to 'git apply'
19716 Update draft release notes for 1.5.1
19717 Teach 'git apply' to look at $HOME/.gitconfig even outside of a repository
19718 git-apply: do not lose cwd when run from a subdirectory.
19719 git-apply: require -p<n> when working in a subdirectory.
19720 Link 1.5.0.1 documentation from the main page.
19722 Mechanical conversion to use prefixcmp()
19723 prefixcmp(): fix-up mechanical conversion.
19724 prefixcmp(): fix-up leftover strncmp().
19725 t4119: add test for traditional patch and different p_value
19726 Fix botched "leak fix"
19727 git-apply: notice "diff --git" patch again
19728 git-apply: guess correct -p<n> value for non-git patches.
19729 t4119: test autocomputing -p<n> for traditional diff input.
19730 git-status: do not be totally useless in a read-only repository.
19731 update-index: do not die too early in a read-only repository.
19732 run_diff_{files,index}(): update calling convention.
19733 .mailmap maintenance after pulling from git-svn
19734 bundle: reword missing prerequisite error message
19735 git-fetch--tool takes flags before the subcommand.
19736 diff --cached: give more sensible error message when HEAD is yet to be created.
19737 Documentation: link in 1.5.0.2 material to the top documentation page.
19738 builtin-fetch--tool: adjust to updated sha1_object_info().
19739 Make 'cvs ci' lockless in git-cvsserver by using git-update-ref
19740 fetch--tool: fix uninitialized buffer when reading from stdin
19741 builtin-fetch--tool: make sure not to overstep ls-remote-result buffer.
19742 index_fd(): use enum object_type instead of type name string.
19743 index_fd(): pass optional path parameter as hint for blob conversion
19744 index_fd(): convert blob only if it is a regular file.
19745 Add recent changes to draft 1.5.1 release notes.
19746 git-fetch: retire update-local-ref which is not used anymore.
19747 builtin-fetch--tool: fix reflog notes.
19748 diff-ni: allow running from a subdirectory.
19749 diff-ni: fix the diff with standard input
19750 .gitignore: add git-fetch--tool
19751 format-patch --attach: not folding some long headers.
19752 Post 1.5.0.3 cleanup
19753 fsck: fix broken loose object check.
19754 unpack_sha1_file(): detect corrupt loose object files.
19755 fsck: exit with non-zero status upon errors
19756 git-bundle: fix pack generation.
19757 revision walker: Fix --boundary when limited
19758 revision traversal: retire BOUNDARY_SHOW
19759 git-bundle: various fixups
19760 revision traversal: SHOWN means shown
19761 git-bundle: make verify a bit more chatty.
19762 revision --boundary: fix stupid typo
19763 revision --boundary: fix uncounted case.
19764 Fix broken create_branch() in builtin-branch.
19765 prepare_packed_git(): sort packs by age and localness.
19766 Documentation: add git-mergetool to the command list.
19767 shortlog: prompt when reading from terminal by mistake
19768 Remove unused diffcore_std_no_resolve
19770 Teach --quiet to diff backends.
19771 revision.c: explain what tree_difference does
19772 try-to-simplify-commit: use diff-tree --quiet machinery.
19773 applymbox: brown paper bag fix.
19774 Update main git.html page to point at 1.5.0.5 documentation
19779 gitweb: Change to use explicitly function call cgi->escapHTML()
19781 Linus Torvalds (8):
19782 Lazy man's auto-CRLF
19783 Make AutoCRLF ternary variable.
19784 Re-fix get_sha1_oneline()
19785 Make trivial wrapper functions around delta base generation and freeing
19786 Implement a simple delta_base cache
19787 Avoid unnecessary strlen() calls
19788 Trivial cleanup of track_tree_refs()
19789 Set up for better tree diff optimizations
19792 Support for large files on 32bit systems.
19794 Michael Coleman (2):
19795 git-send-email: abort/usage on bad option
19796 fix various doc typos
19798 Nicolas Pitre (12):
19799 sha1_file.c: cleanup hdr usage
19800 sha1_file.c: cleanup "offset" usage
19801 sha1_file.c: don't ignore an error condition in sha1_loose_object_info()
19802 formalize typename(), and add its reverse type_from_string()
19803 convert object type handling from a string to a number
19804 get rid of lookup_object_type()
19805 make sure enum object_type is signed
19806 local-fetch.c: some error printing cleanup
19807 fix t5300-pack-object.sh
19808 add test for OFS_DELTA objects
19809 clean up pack index handling a bit
19810 Reuse cached data out of delta base cache.
19813 git-config: document --rename-section, provide --remove-section
19814 git-archimport: allow remapping branch names
19815 git-commit: add a --interactive option
19816 git-branch, git-checkout: autosetup for remote branch tracking
19817 git-fetch, git-branch: Support local --track via a special remote '.'
19820 git-remote: support remotes with a dot in the name
19823 git-svn: make test for SVK mirror path import
19824 git-svn: don't consider SVN URL usernames significant when comparing
19825 git-svn: document --username
19828 t/t5515-fetch-merge-logic.sh: Added tests for the merge login in git-fetch
19829 t/t5515-fetch-merge-logic.sh: Add two more tests
19832 Documentation/git-svn.txt: Fix formatting errors
19834 Shawn O. Pearce (43):
19835 Cleanup check_valid in commit-tree.
19836 cherry-pick: Bug fix 'cherry picked from' message.
19837 Make 'make' quieter while building git
19838 Make 'make' quiet by default
19839 Display the null SHA-1 as the base for an OBJ_OFS_DELTA.
19840 Fix mmap leak caused by reading bad indexes.
19841 Don't build external_grep if its not used
19842 General const correctness fixes
19843 Use uint32_t for all packed object counts.
19844 Use uint32_t for pack-objects counters.
19845 Use off_t when we really mean a file offset.
19846 Use off_t in pack-objects/fast-import when we mean an offset
19847 Cast 64 bit off_t to 32 bit size_t
19848 Preallocate memory earlier in fast-import
19849 Move post-update hook to after all other activity
19850 Don't run post-update hook unless a ref changed
19851 Refactor run_update_hook to be more useful
19852 Refactor handling of error_string in receive-pack
19853 Teach receive-pack to run pre-receive/post-receive hooks
19854 Use atomic updates to the fast-import mark file
19855 Allow fast-import frontends to reload the marks table
19856 Switch to run_command_v_opt in revert
19857 Remove unused run_command variants
19858 Start defining a more sophisticated run_command
19859 Split run_command into two halves (start/finish)
19860 Teach run_command how to setup a stdin pipe
19861 Refactor run_command error handling in receive-pack
19862 Split back out update_hook handling in receive-pack
19863 Change {pre,post}-receive hooks to use stdin
19864 Remove unnecessary casts from fast-import
19865 Simplify closing two fds at once in run-command.c
19866 Fix t5510-fetch's use of sed
19867 Teach run-command about stdout redirection
19868 Teach run-command to redirect stdout to /dev/null
19869 Replace fork_with_pipe in bundle with run_command
19870 Correct new compiler warnings in builtin-revert
19871 Use RUN_GIT_CMD to run push backends
19872 Use run_command for proxy connections
19873 Use run_command within merge-index
19874 Use run_command within receive-pack to invoke index-pack
19875 Use run_command within send-pack
19877 Limit the size of the new delta_base_cache
19879 Simon 'corecode' Schubert (1):
19880 Allow passing of an alternative CVSROOT via -d.
19883 Teach git-remote to update existing remotes by fetching from them
19884 Add config_boolean() method to the Git perl module
19885 Allow git-remote to update named groups of remotes
19886 Add git-mergetool to run an appropriate merge conflict resolution program
19887 mergetool: print an appropriate warning if merge.tool is unknown
19889 Xavier Maillard (1):
19890 contrib/emacs: Use non-interactive function to byte-compile files
19893 Version v1.5.0.7; changes since v1.5.0.6:
19894 -----------------------------------------
19897 Documentation/git-svnimport.txt: fix typo.
19898 Documentation/git-rev-parse.txt: fix example in SPECIFYING RANGES.
19900 H. Peter Anvin (1):
19901 git-upload-pack: make sure we close unused pipe ends
19903 Junio C Hamano (2):
19904 rerere should not repeat the earlier hunks in later ones
19908 Version v1.5.0.6; changes since v1.5.0.5:
19909 -----------------------------------------
19911 J. Bruce Fields (5):
19912 user-manual: run xsltproc without --nonet option
19913 user-manual: Use def_ instead of ref_ for glossary references.
19914 glossary: stop generating automatically
19915 glossary: clean up cross-references
19916 user-manual: introduce "branch" and "branch head" differently
19918 Jakub Narebski (4):
19919 gitweb: Fix "next" link in commit view
19920 gitweb: Don't escape attributes in CGI.pm HTML methods
19921 gitweb: Fix not marking signoff lines in "log" view
19922 gitweb: Add some installation notes in gitweb/INSTALL
19925 commit: fix pretty-printing of messages with "\nencoding "
19928 user-manual.txt: fix a tiny typo.
19930 Johannes Schindelin (1):
19931 t4118: be nice to non-GNU sed
19933 Junio C Hamano (2):
19934 git-commit: "read-tree -m HEAD" is not the right way to read-tree quickly
19938 gitweb: Change to use explicitly function call cgi->escapHTML()
19940 Michael S. Tsirkin (1):
19941 fix typo in git-am manpage
19944 Documentation/pack-format.txt: Clear up description of types.
19947 Version v1.5.0.5; changes since v1.5.0.4:
19948 -----------------------------------------
19950 Junio C Hamano (1):
19954 git-merge: finish when git-read-tree fails
19957 Version v1.5.0.4; changes since v1.5.0.3:
19958 -----------------------------------------
19960 Alexandre Julliard (2):
19961 git.el: Avoid appending a signoff line that is already present.
19962 git.el: Retrieve commit log information from .dotest directory.
19965 git-send-email: Document configuration options
19967 Brian Gernhardt (1):
19968 Fix diff-options references in git-diff and git-format-patch
19970 Frank Lichtenheld (1):
19971 cvsserver: asciidoc formatting changes
19973 J. Bruce Fields (7):
19974 glossary: fix overoptimistic automatic linking of defined terms
19975 user-manual: fix inconsistent example
19976 user-manual: fix inconsistent use of pull and merge
19977 user-manual: fix missing colon in git-show example
19978 user-manual: fix rendering of history diagrams
19979 user-manual: install user manual stylesheet with other web documents
19980 git-merge: warn when -m provided on a fast forward
19983 Documentation: s/seperator/separator/
19984 fast-import: grow tree storage more aggressively
19986 Johannes Schindelin (2):
19987 Begin SubmittingPatches with a check list
19988 make t8001 work on Mac OS X again
19990 Junio C Hamano (3):
19991 git-commit: cd to top before showing the final stat
19992 git-checkout: fix "eval" used for merge labelling.
19995 Matthias Kestenholz (1):
19996 Adjust reflog filemode in shared repository
19998 Matthias Lederhofer (1):
19999 setup_git_directory_gently: fix off-by-one error
20001 Shawn O. Pearce (13):
20002 git-gui: Relocate the menu/transport menu code.
20003 git-gui: Add Reset to the Branch menu.
20004 git-gui: Don't create empty (same tree as parent) commits.
20005 git-gui: Remove unnecessary /dev/null redirection.
20006 fast-import: Avoid infinite loop after reset
20007 fast-import: Fail if a non-existant commit is used for merge
20008 git-gui: Make 'make' quieter by default
20009 Catch write_ref_sha1 failure in receive-pack
20010 git-gui: Allow committing empty merges
20011 git-gui: Revert "Don't modify CREDITS-FILE if it hasn't changed." This reverts commit 92446aba47b0e0db28f7b858ea387efcca30ab44.
20012 git-gui: Revert "git-gui: Display all authors of git-gui." This reverts commit 871f4c97ad7e021d1a0a98c80c5da77fcf70e4af.
20013 git-gui: Allow 'git gui version' outside of a repository
20014 Don't package the git-gui credits file anymore
20017 Add definition of <commit-ish> to the main git man page.
20020 Clarify doc for git-config --unset-all.
20023 Version v1.5.0.3; changes since v1.5.0.2:
20024 -----------------------------------------
20026 Alexandre Julliard (1):
20027 git.el: Set the default commit coding system from the repository config.
20029 Aneesh Kumar K.V (1):
20030 blameview: Fix the browse behavior in blameview
20032 Christian Schlotter (1):
20033 Documentation: Correct minor typo in git-add documentation.
20035 Eygene Ryabinkin (2):
20036 http-push.c::lock_remote(): validate all remote refs.
20037 Another memory overrun in http-push.c
20040 git-cvsexportcommit: don't cleanup .msg if not yet committed to cvs.
20041 Fix quoting in update hook template
20043 J. Bruce Fields (6):
20044 Documentation: mention module option to git-cvsimport
20045 user-manual: reset to ORIG_HEAD not HEAD to undo merge
20046 user-manual: ensure generated manual references stylesheet
20047 user-manual: insert earlier of mention content-addressable architecture
20048 user-manual: how to replace commits older than most recent
20049 user-manual: more detailed merge discussion
20052 diff --cc: integer overflow given a 2GB-or-larger file
20054 Johannes Schindelin (3):
20055 fetch.o depends on the headers, too.
20056 builtin-archive: use RUN_SETUP
20057 Document the config variable format.suffix
20059 Junio C Hamano (5):
20060 git-apply: do not fix whitespaces on context lines.
20061 Documentation: git-remote add [-t <branch>] [-m <branch>] [-f] name url
20062 Start preparing Release Notes for 1.5.0.3
20063 git-merge: fail correctly when we cannot fast forward.
20066 Linus Torvalds (2):
20067 mailinfo: do not get confused with logical lines that are too long.
20068 git-show: Reject native ref
20070 Matthias Kestenholz (1):
20071 Fix git-gc usage note
20073 Michael Coleman (2):
20074 Fix minor typos/grammar in user-manual.txt
20075 builtin-fmt-merge-msg: fix bugs in --file option
20078 Correct ordering in git-cvsimport's option documentation
20081 git-archimport: support empty summaries, put summary on a single line.
20083 Ramsay Allan Jones (5):
20084 Fix a "label defined but unreferenced" warning.
20085 Fix an "implicit function definition" warning.
20086 Fix some "comparison is always true/false" warnings.
20087 Fix a "pointer type missmatch" warning.
20088 Unset NO_C99_FORMAT on Cygwin.
20091 Documentation/build-docdep.perl: Fix dependencies for included asciidoc files
20092 Documentation/git-quiltimport.txt: Fix labeled list formatting
20093 Documentation/git-send-email.txt: Fix labeled list formatting
20095 Shawn O. Pearce (1):
20096 index-pack: Loop over pread until data loading is complete.
20099 Fix git-show man page formatting in the EXAMPLES section
20101 Uwe Kleine-König (1):
20102 Include config.mak in doc/Makefile
20105 glossary: Add definitions for dangling and unreachable objects
20108 Version v1.5.0.2; changes since v1.5.0.1:
20109 -----------------------------------------
20111 Christian Schlotter (1):
20112 git-clone: Sync documentation to usage note.
20114 Dmitry V. Levin (1):
20115 git-show-ref --verify: Fail if called without a reference
20117 Fredrik Kuivinen (1):
20118 Fix 'git commit -a' in a newly initialized repository
20121 Add a compat/strtoumax.c for Solaris 8.
20122 Obey NO_C99_FORMAT in fast-import.c.
20123 Check for PRIuMAX rather than NO_C99_FORMAT in fast-import.c.
20125 Johannes Schindelin (1):
20126 git-diff: fix combined diff
20128 Junio C Hamano (11):
20129 Reword git-am 3-way fallback failure message.
20130 diff-patch: Avoid emitting double-slashes in textual patch.
20131 Don't modify CREDITS-FILE if it hasn't changed.
20132 rerere: do not skip two conflicted paths next to each other.
20133 rerere: do not deal with symlinks.
20134 Add Release Notes to prepare for 1.5.0.2
20135 merge-index: fix longstanding bug in merging symlinks
20136 merge-recursive: fix longstanding bug in merging symlinks
20137 diff --cc: fix display of symlink conflicts during a merge.
20138 Documentation: describe "-f/-t/-m" options to "git-remote add"
20141 Martin Koegler (1):
20142 git-gui: Create new branches from a tag.
20144 Michael Loeffler (1):
20145 Use gunzip -c over gzcat in import-tars example.
20148 git-remote: support remotes with a dot in the name
20150 Robin Rosenberg (1):
20151 Limit filename for format-patch
20154 Allow arbitrary number of arguments to git-pack-objects
20157 core.legacyheaders: Use the description used in RelNotes-1.5.0
20159 Shawn O. Pearce (16):
20160 git-gui: Refactor 'exec git subcmd' idiom.
20161 git-gui: Basic version check to ensure git 1.5.0 or later is used.
20162 git-gui: Permit merging tags into the current branch.
20163 git-gui: More consistently display the application name.
20164 git-gui: Print version on the console.
20165 git-gui: Prefer version file over git-describe.
20166 git-gui: Expose the browser as a subcommand.
20167 git-gui: Correct crash when saving options in blame mode.
20168 git-gui: Use mixed path for docs on Cygwin.
20169 git-gui: Display all authors of git-gui.
20170 git-gui: Change summary of git-gui.
20171 git-gui: Include browser in our usage message.
20172 git-gui: Remove TODO list.
20173 git-gui: Don't crash in citool mode on initial commit.
20174 Document the new core.bare configuration option.
20175 Include git-gui credits file in dist.
20178 Version v1.5.0.1; changes since v1.5.0:
20179 ---------------------------------------
20181 Alexandre Julliard (2):
20182 git-daemon: Avoid leaking the listening sockets into child processes.
20183 sha1_file.c: Round the mmap offset to half the window size.
20185 Fredrik Kuivinen (2):
20186 Read the config in rev-list
20187 Documentation/i18n.txt: it is i18n.commitencoding not core.commitencoding
20189 Junio C Hamano (15):
20190 Documentation: Drop full-stop from git-fast-import title.
20191 cmd-list: add git-remote
20192 Makefile: update check-docs target
20193 Clarify two backward incompatible repository options.
20194 Still updating 1.5.0 release notes.
20195 Add RelNotes 1.5.0.1
20196 Make sure packedgitwindowsize is multiple of (pagesize * 2)
20197 Make gitk work reasonably well on Cygwin.
20198 gitk: Use show-ref instead of ls-remote
20199 GIT-VERSION-FILE: check ./version first.
20200 pretend-sha1: grave bugfix.
20201 git-merge: minor fix for no_trivial_merge_strategies.
20202 Do not take mode bits from index after type change.
20203 Update draft release notes for 1.5.0.1
20207 gitk - remove trailing whitespace from a few lines.
20208 Make gitk save and restore the user set window position.
20209 Make gitk save and restore window pane position on Linux and Cygwin.
20212 Minor corrections to release notes
20214 Paul Mackerras (1):
20215 Change git repo-config to git config
20217 Shawn O. Pearce (2):
20218 Attempt to improve git-rebase lead-in description.
20219 Convert update-index references in docs to add.
20222 git-blame: prevent argument parsing segfault
20225 Version v1.5.0; changes since v1.5.0-rc4:
20226 -----------------------------------------
20228 Alexandre Julliard (3):
20229 diff.c: Reuse the pprint_rename function for diff --summary output.
20230 diff.c: Properly quote file names in diff --summary output.
20231 diff.c: More logical file name quoting for renames in diffstat.
20234 git-gui: fix typo in GIT-VERSION-GEN, "/dev/null" not "/devnull"
20235 Fix potential command line overflow in hooks--update
20237 Aneesh Kumar K.V (1):
20238 blameview: Move the commit info to a pane below the blame window.
20241 Handle uncommitted changes and cache descriptions
20242 git-blame.el: improve color handling
20243 git-blame.el: blame unsaved changes
20244 git-blame.el: Doc fixes and cleanup
20245 git-blame.el: Autoupdate while editing
20248 Make it easier to override path to asciidoc command
20251 git-svn: correctly handle boolean options via git-config
20253 Jakub Narebski (2):
20254 git-blame: Add Emacs Lisp file headers and GNU GPL boilerplate
20255 git-blame: Change installation instructions
20258 Read cvsimport options from repo-config
20260 Johannes Schindelin (5):
20261 for_each_reflog_ent: be forgiving about missing message
20262 log --reflog: honour --relative-date
20263 format-patch -n: make sorting easier by padding number
20264 log --reflog: use dwim_log
20265 git-gc: run pack-refs by default unless the repo is bare
20267 Junio C Hamano (17):
20268 create_symref(): create leading directories as needed.
20269 reflog: handle $name => remotes/%s/HEAD mapping consistently for logs
20270 Documentation/git-pull: describe default behaviour and config interactions
20271 git-fetch: document automatic tag following.
20272 wt_status_prepare(): clean up structure initialization.
20273 diff_flush_name(): take struct diff_options parameter.
20274 t4016: test quoting funny pathnames in diff output
20275 Documentation: git-rebase -C<n>
20276 Teach git-am to pass -p option down to git-apply
20277 Add discussion section to git-tag documentation.
20278 Add RPM target for git-gui
20279 Do not forget to pack objects reachable from HEAD reflog.
20280 for-each-reflog: not having $GIT_DIR/logs directory is not an error.
20281 "git-fetch --tags $URL" should not overwrite existing tags
20282 Documentation: Moving out of detached HEAD does not warn anymore.
20283 Add release notes to the distribution.
20286 Linus Torvalds (2):
20288 Mark places that need blob munging later for CRLF conversion.
20291 Make gitk save and restore the user set window position.
20292 Make gitk save and restore window pane position on Linux and Cygwin.
20294 Matthias Lederhofer (1):
20295 git merge documentation: -m is optional
20297 Michael Loeffler (1):
20298 import-tars: brown paper bag fix for file mode.
20300 Michael S. Tsirkin (3):
20301 Update git-log and git-show documentation
20302 add -C[NUM] to git-am
20303 Document that git-am can read standard input.
20306 Work around Subversion race in git-svn tests.
20309 Fixed some typos in git-repack docs
20312 remove mailmap.linux
20313 Update RPM core package description
20316 Clarify that git-update-server-info should be run for every git-push
20319 Avoid ugly linewrap in git help
20321 Shawn O. Pearce (313):
20322 git-gui: Initial revision.
20323 git-gui: Additional early feature development.
20324 git-gui: Fixed UI layout problems on Windows.
20325 git-gui: Corrected keyboard bindings on Windows, improved state management.
20326 git-gui: Verify we should actually perform a commit when asked to do so.
20327 git-gui: Finished commit implementation.
20328 git-gui: Implemented amended commits.
20329 git-gui: Misc. nit type of bug fixes.
20330 git-gui: Started construction of fetch and push operations.
20331 git-gui: Worked around environment variable problems on Windows.
20332 git-gui: Reorganized startup procedure to ensure gitdir is right.
20333 git-gui: Fix menu item accelerator display on Mac OS X.
20334 git-gui: Correctly handle CR vs. LF within the console of fetch.
20335 git-gui: Check for fetch or push command failure and denote it.
20336 git-gui: Don't complain if no .git/remotes exist.
20337 git-gui: Added current TODO list.
20338 git-gui: Last minute idea about fetch shortcuts.
20339 git-gui: Automatically reopen any console closed by the user.
20340 git-gui: Cache all repo-config data in an array.
20341 git-gui: Added support for pulling from default branch of a remote.
20342 git-gui: Updated TODO list now that pull is starting to work.
20343 git-gui: Corrected diff-index/diff-files protocol parsing errors.
20344 git-gui: Performance improvements for large file sets.
20345 git-gui: More performance improvements to rescan logic.
20346 git-gui: Flip commit message buffer and diff area.
20347 git-gui: Added repack database menu option, to invoke git repack.
20348 git-gui: Allow the user to disable update-index --refresh during rescan.
20349 git-gui: Grab the index lock while running pull.
20350 git-gui: Pluralize timestamps within the options menu.
20351 git-gui: Disable pull menu items when the index is locked.
20352 git-gui: Don't let the user pull into an uncommitted working directory.
20353 git-gui: Update TODO list.
20354 git-gui: Bug fix for bad variable reference in display_file.
20355 git-gui: Changed term 'check-in' to 'include'.
20356 git-gui: Show only the abbreviated SHA1 after committing.
20357 git-gui: Cache the GIT_COMMITTER_IDENT value on first sign-off.
20358 git-gui: Save window geometry to .git/config during exit.
20359 git-gui: Change accelerator for "Include All" to M1-I.
20360 git-gui: Created edit menu and basic editing bindings.
20361 git-gui: Clear undo/redo stack when loading a message file from disk.
20362 git-gui: Updated TODO list now that geometry is stored.
20363 git-gui: Always indicate the file in the diff viewer.
20364 git-gui: Correctly handle files containing LF in their name.
20365 git-gui: Efficiently update the UI after committing.
20366 git-gui: Use catch rather than array names to check file.
20367 git-gui: Rename difffont/mainfont variables.
20368 git-gui: Use native tk_messageBox for errors.
20369 git-gui: Cleaned up error message formatting.
20370 git-gui: Simplified format of geometry configuration.
20371 git-gui: Misc. formatting cleanups.
20372 git-gui: Misc. bug fixes for mouse click crashes.
20373 git-gui: Added context menus for consoles and commit message buffer.
20374 git-gui: Fix mouse cursor behavior when in widgets.
20375 git-gui: Teach sign off to be more intelligent.
20376 git-gui: Corrected font used for options menu items.
20377 git-gui: Honor system font and let user configure fonts.
20378 git-gui: Allow the user to change the diff viewer font size.
20379 git-gui: Refresh a file if it has an empty diff.
20380 git-gui: Make use of the Tk font system rather than faking it.
20381 git-gui: Improve right click context menu binding on all platforms.
20382 git-gui: Rename quitting global to is_quitting.
20383 git-gui: Use arrow cursor rather than left_ptr.
20384 git-gui: Refactor options menu into an options dialog.
20385 git-gui: Allow the user to manipulate the fonts from the options panel.
20386 git-gui: Supply progress feedback when running update-index.
20387 git-gui: Minor options dialog UI cleanups.
20388 git-gui: Added Options... menu item to end of diff context menu.
20389 git-gui: Use 'after 1' to post UI rather than tkwait.
20390 git-gui: Correct bugs in font config handling.
20391 git-gui: Hide non-commit related commands when invoked as git-citool.
20392 git-gui: Don't load the global options unless necessary.
20393 git-gui: Allow the user to disable diff stat summary during pull.
20394 git-gui: Run the pre-commit hook in the background.
20395 git-gui: Remove the commit_active global variable.
20396 git-gui: Added post-commit invocation after the commit is done.
20397 git-gui: Always use eq/ne for string comparsions.
20398 git-gui: Reshow diff if we sent the file to update-index.
20399 git-gui: Cleanup diff construction code to prepare for more options.
20400 git-gui: Allow the user to control the number of context lines in a diff.
20401 git-gui: Sort the list of paths being updated in the index.
20402 git-gui: Use a smaller pipe buffer for update-index.
20403 git-gui: Allow the user to copy name of the file in the diff viewer.
20404 git-gui: Correct language for M_/A_ status codes.
20405 git-gui: Display status on left in diff header.
20406 git-gui: Minor UI layout improvements for console windows.
20407 git-gui: Reverted file name text field to a label.
20408 git-gui: By default don't allow partially included files.
20409 git-gui: Refactor mouse clicking on file names/icons.
20410 git-gui: Narrow the no differences information message.
20411 git-gui: Implemented multiple selection in file lists.
20412 git-gui: Refactor update_status -> rescan.
20413 git-gui: Provide an after-rescan script to rescan.
20414 git-gui: Allow update_index to also run a script when it completes.
20415 git-gui: Automatically update-index all included files before commit.
20416 git-gui: Disable diff actions when no diff is active.
20417 git-gui: Created makefile to install the program.
20418 git-gui: Correctly handle GIT_DIR environment variable.
20419 git-gui: Create Windows shortcut icons for git-gui.
20420 git-gui: Protect ourselves from funny GIT_DIR/working directory setups.
20421 git-gui: Handle ' within paths when creating Windows shortcuts.
20422 git-gui: Only populate a fetch or push if we have an action.
20423 git-gui: Create a .app file on MacOS X if requested.
20424 git-gui: Display error dialog on Mac OS X when no .git found.
20425 git-gui: Make initial commits work properly.
20426 git-gui: Only reshow diff when really necessary.
20427 git-gui: Refactor file state representations.
20428 git-gui: Add menu option to include only selected files.
20429 git-gui: Misc. comment formatting cleanups.
20430 git-gui: Start UI with the index locked.
20431 git-gui: Remove completed items from TODO list.
20432 git-gui: Toggle between new commit and amend commit modes.
20433 git-gui: Verify the user has GIT_COMMITTER_IDENT before comitting.
20434 git-gui: Rephrase rescan before commit informational message.
20435 git-gui: Allow adding untracked files in selection.
20436 git-gui: Don't create PkgInfo on Mac OS X "desktop icons".
20437 git-gui: Teach the gui how to uninclude a file.
20438 git-gui: Make consecutive icon clicks toggle included status of a file.
20439 git-gui: Correct toggling of deleted file status.
20440 git-gui: Fix list loading corruption introduced by 1461c5f3.
20441 git-gui: Describe deleted symlinks in a more friendly way.
20442 git-gui: Correct toggling of added/untracked status for new files.
20443 git-gui: Updated TODO list now that a task is complete.
20444 git-gui: Refactored diff line display formatting logic.
20445 git-gui: Restore the all important shebang line.
20446 git-gui: Update in memory states after commit.
20447 git-gui: Correct some state matchings for include/remove.
20448 git-gui: Improve handling of merge commits.
20449 git-gui: Allow users to run fsck-objects from the gui.
20450 git-gui: Don't save amended commit message buffer.
20451 git-gui: Reworded verify console title.
20452 git-gui: Seperate out the database operations in project menu.
20453 git-gui: Rename Project menu to Repository.
20454 git-gui: Added about dialog box.
20455 git-gui: Be more Macintosh like.
20456 git-gui: Make the copyright notice serve double duty.
20457 git-gui: Include the Tcl/Tk version in the about dialog.
20458 git-gui: Abstract out windows platform test to is_Windows proc.
20459 git-gui: Correct is_MacOSX platform test.
20460 git-gui: Warn Cygwin users about possible environment issues.
20461 git-gui: Added configuration editor TODO list.
20462 git-gui: Refactor M1 binding selection.
20463 git-gui: Added menu command to visualize all branches.
20464 git-gui: Don't start 'gitk --all' on Mac OS X.
20465 git-gui: Improve pull error dialogs.
20466 git-gui: Added revert changes command.
20467 git-gui: Display the current branch.
20468 git-gui: Support file state MD (modified/deleted).
20469 git-gui: Created Branch menu.
20470 git-gui: Parse off refs/remotes when showing current branch.
20471 git-gui: Abort on not implemented branch switching.
20472 git-gui: Automatically skip tracking branches in branch menu.
20473 git-gui: Rename all_branches -> all_heads.
20474 git-gui: Misc. comment and formatting cleanups.
20475 git-gui: Started implementation of switch_branch.
20476 git-gui: Set a proper title on our revert confirm dialog box.
20477 git-gui: Updated todo list.
20478 git-gui: Enable resolution of merge conflicts.
20479 git-gui: Auto-update any A? or M? files during rescan.
20480 git-gui: Reworded 'Include' to 'Add' to match core Git.
20481 git-gui: Created very crude Tools menu, to support miga.
20482 git-gui: Show all fetched branches for remote pulls.
20483 git-gui: Run git-gc rather than git-repack.
20484 git-gui: Corrected behavior of deleted (but existing in HEAD) files.
20485 git-gui: Correct wording of the revert confirmation dialog.
20486 git-gui: Work around odd cygpath bug on Windows.
20487 git-gui: Change more 'include' language to 'add'.
20488 git-gui: Hide the ugly bash command line from the windows desktop icon.
20489 git-gui: Modified makefile to embed version into git-gui script.
20490 git-gui: Display the git-gui version in the Help->About dialog.
20491 git-gui: Display the full GPL copyright notice in about dialog.
20492 git-gui: Ensure version number is always current.
20493 git-gui: Allow the user to copy the version data to the clipboard.
20494 git-gui: Don't offer my miga hack if its configuration file isn't present.
20495 git-gui: Suggest when running 'git gc' may be worthwhile.
20496 git-gui: Refactor reponame computation.
20497 git-gui: Cleanup usage of gitdir global variable.
20498 git-gui: Allow [gitdir ...] to act as [file join [gitdir] ...].
20499 git-gui: Make the gitk starting message match our usual format.
20500 git-gui: Display the directory we are entering during startup.
20501 git-gui: Start file status display refactoring.
20502 git-gui: Convert UI to use 'staged for commit' interface.
20503 git-gui: Correct DD file state to be only D_.
20504 git-gui: Remove invalid DM state.
20505 git-gui: Cleanup state descriptions.
20506 git-gui: Refactor add/remove proc names to align with reality.
20507 git-gui: Add or unstage based on the specific icon used.
20508 git-gui: Refactor the revert (aka checkout-index) implementation.
20509 git-gui: Refactor the add to commit state filters.
20510 git-gui: Simplify printing of index info to update-index.
20511 git-gui: Only permit selection in one list at a time.
20512 git-gui: Pad the cancel/save buttons in the options window.
20513 git-gui: Implemented create branch GUI.
20514 git-gui: Bind M1-N to create branch.
20515 git-gui: Implemented local branch deletion.
20516 git-gui: Allow users to delete branches merged upstream.
20517 git-gui: Allow creating branches from tracking heads.
20518 git-gui: Use borders on text fields in branch dialog.
20519 git-gui: Remove 'Allow Partially Added Files' option.
20520 git-gui: Move commit_prehook into commit_tree.
20521 git-gui: Improve the branch delete confirmation dialogs.
20522 git-gui: Don't delete the test target branch.
20523 git-gui: Attempt to checkout the new branch after creation.
20524 git-gui: Refactor current_diff -> current_diff_path.
20525 git-gui: Remove combined diff showing behavior.
20526 git-gui: Improve the display of merge conflicts.
20527 git-gui: Improve diff --cc viewing for unmerged files.
20528 git-gui: Fix bug in unmerged file display.
20529 git-gui: Clear diff from viewer if the side changed.
20530 git-gui: Correct disappearing unstaged files.
20531 git-gui: Add Refresh to diff viewer context menu.
20532 git-gui: Correct unmerged file detection at commit time.
20533 git-gui: Pad new branch name input box.
20534 git-gui: Use a grid layout for branch dialog.
20535 git-gui: Improve the merge check interface for branch deletion.
20536 git-gui: Change rude error popup to info popup.
20537 git-gui: Correctly ignore '* Unmerged path' during diff.
20538 git-gui: Make diff viewer colors match gitk's defaults.
20539 git-gui: Never line wrap in file lists.
20540 git-gui: Don't offer tracking branches if none exist.
20541 git-gui: Give a better error message on an empty branch name.
20542 git-gui: Allow user to specify a branch name pattern.
20543 git-gui: Improve keyboard traversal in dialogs.
20544 git-gui: Fully select a field when entering into it.
20545 git-gui: Automatically toggle the relevant radio buttons.
20546 git-gui: Correctly categorize tracking branches and heads.
20547 git-gui: Update todo list with finished and new items.
20548 git-gui: Slightly tweak new window geometry.
20549 git-gui: Create missing branch head on initial commit.
20550 git-gui: Don't format the mode line of a diff.
20551 git-gui: Force an update-index --refresh on unchanged files.
20552 git-gui: Don't attempt to tag new file/deleted file headers in diffs.
20553 git-gui: Fix 'Select All' action on Windows.
20554 git-gui: Ignore 'No newline at end of file' marker line.
20555 git-gui: Always start a rescan on an empty diff.
20556 git-gui: Don't show content of untracked binary files.
20557 git-gui: Limit display of large untracked files.
20558 git-gui: When possible show the type of an untracked file.
20559 git-gui: Don't try to tag the 'Binary files * and * differ' line.
20560 git-gui: Remove spurious newline in untracked file display.
20561 git-gui: Honor system encoding for filenames.
20562 git-gui: Handle commit encoding better.
20563 git-gui: Display database stats (count-objects -v) on demand.
20564 git-gui: Implement basic branch switching through read-tree.
20565 git-gui: Use system default labelframe bordering.
20566 git-gui: Display the size of the pack directory.
20567 git-gui: Only allow Refresh in diff context menu when we have a diff.
20568 git-gui: Allow staging/unstaging individual diff hunks.
20569 git-gui: Elide CRs appearing in diff output from display.
20570 git-gui: Cleanup end-of-line whitespace in commit messages.
20571 git-gui: Unset unnecessary UI setup variable.
20572 git-gui: Force focus to the diff viewer on mouse click.
20573 git-gui: Support 'Visualize All Branches' on Mac OS X.
20574 git-gui: Pad the database statistics dialog window.
20575 git-gui: Prefer Tk's entry widget over a 1 line text field.
20576 git-gui: Remove Pull menu and cleanup Branch/Fetch/Push menus.
20577 git-gui: Don't switch branches if changing to the current branch.
20578 git-gui: Maintain the same file list for diff during refresh.
20579 git-gui: Always use lsearch -exact, to prevent globbing.
20580 git-gui: Added arbitrary branch pushing support.
20581 git-gui: Remove no longer used pull from remote code.
20582 git-gui: Always use -v option to push.
20583 git-gui: Refactor console success/failure handling.
20584 git-gui: Use builtin version of 'git gc'.
20585 git-gui: Implement local merge operations.
20586 git-gui: Let users abort with `reset --hard` type logic.
20587 git-gui: Update status bar during a merge.
20588 git-gui: Don't allow users to commit a bad octopus merge.
20589 git-gui: Don't allow merges in the middle of other things.
20590 git-gui: Always offer scrollbars for branch lists.
20591 git-gui: Support merge.summary, merge.verbosity.
20592 git-gui: Reword meaning of merge.summary.
20593 git-gui: Offer quick access to the HTML formatted documentation.
20594 git-gui: Test for Cygwin differently than from Windows.
20595 git-gui: Implemented file browser and incremental blame.
20596 git-gui: Improve the icons used in the browser display.
20597 git-gui: Display the current branch name in browsers.
20598 git-gui: Allow users to edit user.name, user.email from options.
20599 git-gui: Use -M and -C when running blame.
20600 git-gui: Correctly handle spaces in filepaths.
20601 git-gui: Display original filename and line number in blame.
20602 git-gui: Install column headers in blame viewer.
20603 git-gui: Use a grid layout for the blame viewer.
20604 git-gui: Assign background colors to each blame hunk.
20605 Correct ^0 asciidoc syntax in fast-import docs.
20606 Correct some language in fast-import documentation.
20607 Correct spelling of fast-import in docs.
20608 tar archive frontend for fast-import.
20609 git-gui: Update known branches during rescan.
20610 git-gui: Support keyboard traversal in browser.
20611 git-gui: Replace \ with \\ when showing paths.
20612 git-gui: Refactor single_commit to a proc.
20613 git-gui: Separate transport/branch menus from multicommit.
20614 git-gui: Optionally save commit buffer on exit.
20615 git-gui: View blame from the command line.
20616 git-gui: Select subcommands like git does.
20617 git-gui: Relabel the Add All action.
20618 git-gui: Use git-config now over git-repo-config.
20619 git-gui: Redesign the display of annotated files.
20620 git-gui: Jump to the first annotation block as soon as its available.
20621 git-gui: Improve annotated file display.
20622 git-gui: Focus into blame panels on Mac OS.
20623 git-gui: Stop deleting gitk preferences.
20624 fast-import: Hide the pack boundary commits by default.
20625 fast-import: Add tip about importing renames.
20626 bash: Hide git-fast-import.
20627 fast-import: Support reusing 'from' and brown paper bag fix reset.
20628 git-gui: Allow gitexecdir, INSTALL to be set by the caller.
20629 git-gui: Rename GIT_VERSION to GITGUI_VERSION.
20630 git-gui: Generate a version file on demand.
20631 git-gui: Handle gitgui tags in version gen.
20632 git-gui: Guess our version accurately as a subproject.
20633 git-gui: Change base version to 0.6.
20634 Link git-gui into the master Makefile.
20637 Print a sane error message if an alias expands to an invalid git command
20638 Allow aliases to expand to shell commands
20641 Version v1.5.0-rc4; changes since v1.5.0-rc3:
20642 ---------------------------------------------
20645 Avoid ActiveState Perl IO in t800[12]
20648 doc: hooks.txt said post-commit default sends an email, it doesn't
20649 git-for-each-ref doesn't return "the bit after $GIT_DIR/refs"
20651 Aneesh Kumar K.V (1):
20652 blameview: Support browsable functionality to blameview.
20655 git-blame: an Emacs minor mode to view file with git-blame output.
20658 git-svn: do not let Git.pm warn if we prematurely close pipes
20659 Disallow invalid --pretty= abbreviations
20662 git-archimport: initial import needs empty directory
20664 Horst H. von Brand (1):
20665 Call make always with CFLAGS in git.spec
20667 Johannes Schindelin (4):
20668 Teach the '@{...}' notation to git-log -g
20669 Update the documentation for the new '@{...}' syntax
20670 Commands requiring a work tree must not run in GIT_DIR
20671 fast-import: Fix compile warnings
20673 Junio C Hamano (36):
20674 create_symref(): do not assume pathname from git_path() persists long enough
20675 detached HEAD -- finishing touches
20676 Use "git checkout -q" in git-bisect
20677 Tutorial: fix asciidoc formatting of "git add" section.
20678 Tutorial-2: Adjust git-status output to recent reality.
20679 core-tutorial: http reference link fix
20680 fix reflog entries for "git-branch"
20681 honor GIT_REFLOG_ACTION in git-commit
20682 Why is it bad to rewind a branch that has already been pushed out?
20683 combine-diff: special case --unified=0
20684 show-branch -g: default to the current branch.
20685 git-clone --reference: saner handling of borrowed symrefs.
20686 Revert "Allow branch.*.merge to talk about remote tracking branches."
20687 Rename get_ident() to fmt_ident() and make it available to outside
20688 t9200: Work around HFS+ issues.
20689 bisect: it needs to be done in a working tree.
20690 git-blame: no rev means start from the working tree file.
20691 Add pretend_sha1_file() interface.
20692 Use pretend_sha1_file() in git-blame and git-merge-recursive.
20693 blame: document --contents option
20694 Teach git-remote add to fetch and track
20695 Fix longstanding mismerge of ALL_CFLAGS vs BASIC_CFLAGS
20696 gitk: Use show-ref instead of ls-remote
20697 git-push: allow globbing wildcard refspec.
20698 gitweb: fix mismatched parenthesis
20699 annotate: fix for cvsserver.
20701 Remove contrib/colordiff
20702 Add deprecation notices.
20703 Remove git-merge-recur
20704 git-clone --reference: work well with pack-ref'ed reference repository
20705 for-each-reflog: fix case for empty log directory
20706 t4200: skip gc-rerere test on systems with non GNU date.
20707 git-add -i: update removed path correctly.
20708 Documentation: Add gfi to the main command list.
20711 Linus Torvalds (2):
20712 pager: Work around window resizing bug in 'less'
20713 Fix "git log -z" behaviour
20716 gitk - remove trailing whitespace from a few lines.
20717 Make gitk work reasonably well on Cygwin.
20719 Michael Coleman (1):
20720 Fix some documentation typos and grammar
20722 Michele Ballabio (1):
20723 Documentation: add KMail in SubmittingPatches
20725 Nicolas Pitre (14):
20726 make reflog filename independent from struct ref_lock
20727 lock_ref_sha1_basic(): remember the original name of a ref when resolving it
20728 enable separate reflog for HEAD
20729 add reflog entries for HEAD when detached
20730 move create_symref() past log_ref_write()
20731 add logref support to git-symbolic-ref
20732 add reflog when moving HEAD to a new branch
20733 reword the detached head message a little again
20734 add a quiet option to git-checkout
20735 prevent HEAD reflog to be interpreted as current branch reflog
20736 provide a nice @{...} syntax to always mean the current branch reflog
20737 scan reflogs independently from refs
20738 Enable HEAD@{...} and make it independent from the current branch
20739 Let git-checkout always drop any detached head
20742 git-config --rename-section could rename wrong section
20743 Assorted typo fixes
20745 Robin Rosenberg (1):
20746 Why is it bad to rewind a branch that has already been pushed out?
20748 Shawn O. Pearce (113):
20749 Created fast-import, a tool to quickly generating a pack from blobs.
20750 Added automatic index generation to fast-import.
20751 Cleaned up memory allocation for object_entry structs.
20752 Refactored fast-import's internals for future additions.
20753 Added basic command handler to fast-import.
20754 Implemented branch handling and basic tree support in fast-import.
20755 Added tree and commit writing to fast-import.
20756 Implement blob ID validation in fast-import.
20757 Converted fast-import to a text based protocol.
20758 Changed fast-import's pack header creation to use pack.h
20759 Allow symlink blobs in trees during fast-import.
20760 Fixed segfault in fast-import after growing a tree.
20761 Converted fast-import to accept standard command line parameters.
20762 Added mark store/find to fast-import.
20763 Added branch load counter to fast-import.
20764 Implemented 'tag' command in fast-import.
20765 Implemented tree reloading in fast-import.
20766 Round out memory pool allocations in fast-import to pointer sizes.
20767 Remove branch creation command from fast-import.
20768 Moved from command to after data to help cvs2svn.
20769 Account for tree entry memory costs in fast-import.
20770 Added option to export the marks table when fast-import terminates.
20771 Added --branch-log to option to fast-import.
20772 Fixed GPF in fast-import caused by unterminated linked list.
20773 Fixed compile error in fast-import.
20774 Map only part of the generated pack file at any point in time.
20775 Added 'reset' command to clear a branch's tree.
20776 Don't crash fast-import if no branch log was requested.
20777 Converted hash memcpy/memcmp to new hashcpy/hashcmp/hashclr.
20778 Implemented tree delta compression in fast-import.
20779 Recycle data buffers for tree generation in fast-import.
20780 Reuse the same buffer for all commits/tags in fast-import.
20781 Replace ywrite in fast-import with the standard write_or_die.
20782 Correct tree corruption problems in fast-import.
20783 Additional fast-import tree delta corruption cleanups.
20784 Fix repository corruption when using marks for modified blobs.
20785 Support creation of merge commits in fast-import.
20786 Allow creating branches without committing in fast-import.
20787 Improve reuse of sha1_file library within fast-import.
20788 Misc. type cleanups within fast-import.
20789 Restructure fast-import to support creating multiple packfiles.
20790 Remove unnecessary duplicate_count in fast-import.
20791 Implemented manual packfile switching in fast-import.
20792 Don't create a final empty packfile in fast-import.
20793 Optimize index creation on large object sets in fast-import.
20794 Implemented automatic checkpoints within fast-import.
20795 Print the packfile names to stdout from fast-import.
20796 Corrected buffer overflow during automatic checkpoint in fast-import.
20797 Use uintmax_t for marks in fast-import.
20798 Replace redundant yread() with read_in_full() in fast-import.
20799 Reuse sha1 in packed_git in fast-import.
20800 Use .keep files in fast-import during processing.
20801 Ensure we close the packfile after creating it in fast-import.
20802 Remove unnecessary pack_fd global in fast-import.
20803 Correct max_packsize default in fast-import.
20804 Correct object_count type and stat output in fast-import.
20805 Print out the edge commits for each packfile in fast-import.
20806 Corrected BNF input documentation for fast-import.
20807 Correct a few types to be unsigned in fast-import.
20808 Declare no-arg functions as (void) in fast-import.
20809 Correct packfile edge output in fast-import.
20810 Always use struct pack_header for pack header in fast-import.
20811 Use fixed-size integers when writing out the index in fast-import.
20812 Remove unnecessary options from fast-import.
20813 Support delimited data regions in fast-import.
20814 Create test case for fast-import.
20815 Reduce value duplication in t9300-fast-import.
20816 Accept 'inline' file data in fast-import commit structure.
20817 Pull out remote listing functions in git-remote.
20818 Teach 'git remote' how to cleanup stale tracking branches.
20819 Cleanup prepare_packed_git_one to reuse install_packed_git.
20820 Correct comment in prepare_packed_git_one.
20821 Refactor open_packed_git to return an error code.
20822 Don't find objects in packs which aren't available anymore.
20823 Don't leak file descriptors from unavailable pack files.
20824 Cleanup subcommand documentation for git-remote.
20825 Keep untracked files not involved in a merge.
20826 Default GIT_MERGE_VERBOSITY to 5 during tests.
20827 bash: Remove short option completions for branch/checkout/diff.
20828 bash: Classify cat-file and reflog as plumbing.
20829 bash: Complete long options to git-add.
20830 bash: Add space after unique command name is completed.
20831 bash: Classify more commends out of completion.
20832 bash: Support unique completion on git-config.
20833 bash: Support unique completion when possible.
20834 bash: Support internal revlist options better.
20835 Include checkpoint command in the BNF.
20836 Reduce memory usage of fast-import.
20837 Show an example of deleting commits with git-rebase.
20838 bash: Support completion on git-cherry.
20839 bash: Hide diff-stages from completion.
20840 bash: Offer --prune completion for git-gc.
20841 bash: Hide git-resolve, its deprecated.
20842 bash: Support --add completion to git-config.
20843 bash: Support git-bisect and its subcommands.
20844 Don't support shell-quoted refnames in fast-import.
20845 Initial draft of fast-import documentation.
20846 bash: Support git-rebase -m continuation completion.
20847 bash: Complete git-remote subcommands.
20848 Remove --branch-log from fast-import.
20849 Correct compiler warnings in fast-import.
20850 Correct minor style issue in fast-import.
20851 Correct fast-import timezone documentation.
20852 Remove unnecessary null pointer checks in fast-import.
20853 Minor fast-import documentation corrections.
20854 Support RFC 2822 date parsing in fast-import.
20855 Don't do non-fastforward updates in fast-import.
20856 Minor timestamp related documentation corrections for fast-import.
20857 Teach fast-import how to clear the internal branch content.
20858 Teach fast-import how to sit quietly in the corner.
20859 Dump all refs and marks during a checkpoint in fast-import.
20860 Don't crash fast-import if the marks cannot be exported.
20861 Add a Tips and Tricks section to fast-import's manual.
20863 Simon 'corecode' Schubert (1):
20864 Allow forcing of a parent commit, even if the parent is not a direct one.
20867 Add hg-to-git conversion utility.
20869 Uwe Kleine-König (1):
20870 add replay and log to the usage string of git-bisect
20873 gitweb: Convert project name to UTF-8
20876 Version v1.5.0-rc3; changes since v1.5.0-rc2:
20877 ---------------------------------------------
20880 Insert ACTIVESTATE_STRING in Git.pm
20881 Force Activestate Perl to tie git command pipe handle to a handle class
20882 Cleanup uninitialized value in chomp
20883 Allow default core.logallrefupdates to be overridden with template's config
20884 Fix git-update-index to work with relative pathnames.
20886 Alexandre Julliard (1):
20887 vc-git.el: Take into account the destination name in vc-checkout.
20890 New files in git weren't being downloaded during CVS update
20891 If abbrev is set to zero in git-describe, don't add the unique suffix
20892 Allow the tag signing key to be specified in the config file
20893 UNIX reference time of 1970-01-01 00:00 is UTC timezone, not local time zone
20894 Heavily expanded update hook to send more useful emails than the old hook
20896 Aneesh Kumar K.V (2):
20897 blameview: Use git-cat-file to read the file content.
20898 Update git-cat-file documentation
20901 Document --check option to git diff.
20904 Improved error message from git-rebase
20907 git-svn: remove leading slash when printing removed directories
20909 J. Bruce Fields (31):
20910 Documentation: add git user's manual
20911 Documentation: expand preface and todo's
20912 Documentation: git-rebase discussion, miscellaneous user-manual updates
20913 Documentation: more user-manual todo's
20914 Documentation: reorder development section, todo's
20915 Documentation: begin discussion of git-remote in user manual
20916 Documentation: rev-list -> rev-parse, other typos, start examples
20917 user manual: answer some comments from Junio
20918 user-manual: replace init-db by init
20919 user-manual: reindent
20920 user-manual: rewrap, fix heading levels
20921 user-manual: add "quick start" as chapter 1
20922 user-manual: minor quickstart reorganization
20923 user-manual: clarify difference between tag and branch
20924 user-manual: update references discussion
20925 user-manual: update git-gc discussion
20926 user-manual: stub discussion of fsck and reflog
20927 user-manual: reorganize fetch discussion, add internals, etc.
20928 user-manual: git-fsck, dangling objects
20929 user-manual: fsck-objects -> fsck
20930 user-manual: repo-config -> config
20931 user-manual: add references to git-config man page
20932 user-manual: typo fix
20933 user-manual: fix a header level
20934 user-manual: reflogs, other recovery
20935 user-manual: rewrap a few long lines
20936 user-manual: minor "TODO" updates
20937 user-manual: document git-show-branch example
20938 user-manual: SHA1 -> object name
20939 user-manual: point to README for gitweb information
20940 user-manual: todo's
20942 Jakub Narebski (3):
20943 Documentation/config.txt: Document config file syntax better
20944 t/t1300-repo-config.sh: value continued on next line
20945 Documentation/config.txt: Correct info about subsection name
20948 Use inttypes.h rather than stdint.h.
20951 format-patch: fix bug with --stdout in a subdirectory
20952 contrib/vim: update syntax for changed commit template
20953 diffcore-pickaxe: fix infinite loop on zero-length needle
20954 Add a sample program 'blameview' to show how to use git-blame --incremental
20956 Johannes Schindelin (2):
20957 annotate: use pager
20958 reflog inspection: introduce shortcut "-g"
20961 Add a missing fork() error check.
20963 Junio C Hamano (43):
20964 User manual: fix typos in examples
20965 Documentation/tutorial-2: Fix interesting typo in an example.
20966 Revert "prune: --grace=time"
20967 Make sure git_connect() always give two file descriptors.
20968 is_repository_shallow(): prototype fix.
20969 shallow repository: disable unsupported operations for now.
20970 git-gc: do not run git-prune by default.
20971 cvsimport: activate -a option, really.
20972 .mailmap: fix screw-ups in Uwe's name
20973 honor --author even with --amend, -C, and -c.
20974 reflog gc: a tag that does not point at a commit is not a crime.
20975 git-checkout -m: fix merge case
20976 git-daemon documentation on enabling services.
20977 ls-remote and clone: accept --upload-pack=<path> as well.
20978 Refactor the pack header reading function out of receive-pack.c
20979 Allow fetch-pack to decide keeping the fetched pack without exploding
20980 fetch-pack: remove --keep-auto and make it the default.
20981 Consolidate {receive,fetch}.unpackLimit
20982 Allow non-developer to clone, checkout and fetch more easily.
20983 parse-remote: do not barf on a remote shorthand without any refs to fetch.
20984 show-branch -g: default to HEAD
20985 Documentation: pack-refs --all vs default behaviour
20986 Make sure we do not write bogus reflog entries.
20987 git-merge: leave sensible reflog message when used as the first level UI.
20988 create_symref: check error return from open().
20989 write_in_full: size_t is unsigned.
20990 Don't force everybody to call setup_ident().
20991 git-blame --porcelain: quote filename in c-style when needed.
20992 Update describe documentation.
20993 Document 'git-blame --incremental'
20994 git-fsck-objects is now synonym to git-fsck
20995 Two small typofixes.
20996 lock_any_ref_for_update(): do not accept malformatted refs.
20997 git-commit -s: no extra space when sign-offs appear at the end already.
20998 git-blame: somewhat better commenting.
20999 git-send-email: remove debugging output.
21001 Documentation: "git-checkout <tree> <path>" takes any tree-ish
21002 t9200: Re-code non-ascii path test in UTF-8
21003 t9200: do not test -x bit if the filesystem does not support it.
21004 git main documentation: point at the user's manual.
21005 Do not use hardcoded path to xhmtl.xsl to generate user's manual
21008 Linus Torvalds (5):
21009 fsck-objects: refactor checking for connectivity
21010 Fix seriously broken "git pack-refs"
21011 Add dangling objects tips.
21012 git-blame --incremental
21013 git-push through git protocol
21016 wt-status: Actually accept `color.status.BLAH' configuration variables.
21017 Documentation/config.txt: Fix documentation of colour config tweaks.
21018 Make fsck and fsck-objects be builtins.
21021 fix suggested branch creation command when detaching head
21022 git-log -g --pretty=oneline should display the reflog message
21023 tone down the detached head warning
21026 sha1_file.c: Avoid multiple calls to find_pack_entry().
21027 Documentation: --amend cannot be combined with -c/-C/-F.
21030 git-blame --incremental: don't use pager
21033 contrib/emacs/vc-git.el: support vc-version-other-window
21036 git-fetch: Allow fetching the remote HEAD
21038 Shawn O. Pearce (6):
21039 Remove unnecessary found variable from describe.
21040 Teach git-describe to display distances from tags.
21041 Compute accurate distances in git-describe before output.
21042 Teach for-each-ref about a little language called Tcl.
21043 Don't coredump on bad refs in update-server-info.
21044 Escape --upload-pack from expr.
21046 Simon 'corecode' Schubert (1):
21047 Replace perl code with pure shell code
21050 Rename git-repo-config to git-config.
21052 Uwe Kleine-König (2):
21053 rename --exec to --upload-pack for fetch-pack and peek-remote
21054 make --upload-pack option to git-fetch configurable
21057 Version v1.5.0-rc2; changes since v1.5.0-rc1:
21058 ---------------------------------------------
21061 git-revert: Fix die before git-sh-setup defines it.
21063 Chris Wedgwood (1):
21064 cache.h; fix a couple of prototypes
21067 Shell syntax fix in git-reset
21068 Document --ignore-if-in-upstream in git-format-patch
21071 gitk: add current directory to main window title
21074 git-svn: fix tests to work with older svn
21075 git-svn: print and flush authentication prompts to STDERR
21078 Start all test scripts with /bin/sh.
21079 Set _ALL_SOURCE for AIX, but avoid its struct list.
21080 Replace "echo -n" with printf in shell scripts.
21081 Solaris 5.8 returns ENOTDIR for inappropriate renames.
21084 git-pull: disallow implicit merging to detached HEAD
21086 Johannes Schindelin (9):
21087 Fix spurious compile error
21088 config_set_multivar(): disallow newlines in keys
21089 show_date(): fix relative dates
21090 apply --cached: fix crash in subdirectory
21091 Do not verify filenames in a bare repository
21092 Teach the revision walker to walk by reflogs with --walk-reflogs
21093 --walk-reflogs: disallow uninteresting commits
21094 --walk-reflogs: actually find the right commit by date.
21095 --walk-reflogs: do not crash with cyclic reflog ancestry
21097 Junio C Hamano (69):
21098 reflog-expire: brown paper bag fix.
21099 merge-recursive: do not report the resulting tree object name
21100 Explain "Not a git repository: '.git'".
21102 Make git-prune-packed a bit more chatty.
21103 Define cd_to_toplevel shell function in git-sh-setup
21104 Use cd_to_toplevel in scripts that implement it by hand.
21105 Allow whole-tree operations to be started from a subdirectory
21106 Use log output encoding in --pretty=email headers.
21107 t3901: test "format-patch | am" pipe with i18n
21108 git-commit documentation: -a adds and also removes
21109 Consistent message encoding while reusing log from an existing commit.
21110 More tests in t3901.
21111 git log documentation: teach -<n> form.
21113 Documentation: merge-output is not too verbose now.
21114 Use merge-recursive in git-revert/git-cherry-pick
21115 git reflog expire: document --stale-fix option.
21116 Fix git-fetch while on detached HEAD not to give needlessly alarming errors
21117 git-push documentation: remaining bits
21118 git-rm documentation: remove broken behaviour from the example.
21119 tutorial: shorthand for remotes but show distributed nature of git
21120 git-commit documentation: remove comment on unfixed git-rm
21121 Use merge-recursive in git-checkout -m (branch switching)
21122 Document where configuration files are in config.txt
21123 git-commit: document log message formatting convention
21124 Documentation/SubmittingPatches: Gnus tips
21125 Documentation/git-tag: the command can be used to also verify a tag.
21126 Documentation/git-tools.txt: mention tig and refer to wiki
21127 Documentation/git-tar-tree.txt: default umask is now 002
21128 Documentation/git-status.txt: mention color configuration
21129 Documentation/git-whatchanged.txt: show -<n> instead of --max-count.
21130 Documentation/git-sh-setup.txt: programmer's docs
21131 Documentation: detached HEAD
21132 Make a short-and-sweet "git-add -i" synonym for "git-add --interactive"
21133 Documentation: describe shallow repository
21134 Documentation/glossary.txt: unpacked objects are loose.
21135 Documentation/glossary.txt: describe remotes/ tracking and packed-refs
21136 Introduce 'git-format-patch --suffix=.patch'
21137 git-format-patch: do not crash with format.headers without value.
21138 Documentation/git-resolve: deprecated.
21139 Documentation: suggest corresponding Porcelain-level in plumbing docs.
21140 Documentation: m can be relative in "git-blame -Ln,m"
21141 Documentation/git-parse-remote.txt: we deal with config vars as well
21142 git-format-patch -3
21143 Add --summary to git-format-patch by default
21144 git-format-patch: make --binary on by default
21145 git-format-patch: the default suffix is now .patch, not .txt
21146 Use fixed-size integers for .idx file I/O
21147 Documentation: move command list in git.txt into separate files.
21148 Documentation: sync git.txt command list and manual page title
21149 Documentation: Generate command lists.
21150 for_each_reflog_ent: do not leak FILE *
21151 refs.c::read_ref_at(): fix bogus munmap() call.
21152 Documentation: generated cmds-*.txt does not depend on git.txt
21153 Documentation/git.txt: command re-classification
21154 dwim_ref(): Separate name-to-ref DWIM code out.
21155 Extend read_ref_at() to be usable from places other than sha1_name.
21156 show-branch --reflog: show the reflog message at the top.
21157 show-branch --reflog: tighten input validation.
21158 show-branch --reflog: fix show_date() call
21159 Stop ignoring Documentation/README
21160 git-tag -d: allow deleting multiple tags at once.
21161 branch -f: no reason to forbid updating the current branch in a bare repo.
21162 git-rebase: allow rebasing a detached HEAD.
21163 log --walk-reflog: documentation
21164 reflog-walk: build fixes
21165 Fix --walk-reflog with --pretty=oneline
21168 Linus Torvalds (2):
21169 Clean up write_in_full() users
21170 Fix up totally buggered read_or_die()
21172 Matthias Lederhofer (2):
21173 prune-packed: add -q to usage
21174 prune: --grace=time
21176 Michael S. Tsirkin (1):
21177 fix documentation for git-commit --no-verify
21180 use 'init' instead of 'init-db' for shipped docs and tools
21181 simplify the "no changes added to commit" message
21183 sanitize content of README file
21186 Make gitk work when launched in a subdirectory
21189 git-remote: no longer silent on unknown commands.
21192 Documentation: a few spelling fixes
21195 tutorial: Use only separate layout
21197 Shawn O. Pearce (18):
21198 Improve merge performance by avoiding in-index merges.
21199 Hide output about SVN::Core not being found during tests.
21200 Remove read_or_die in favor of better error messages.
21201 Remove unnecessary call_depth parameter in merge-recursive.
21202 Allow the user to control the verbosity of merge-recursive.
21203 Enable output buffering in merge-recursive.
21204 Display a progress meter during merge-recursive.
21205 Convert output messages in merge-recursive to past tense.
21206 Always perfer annotated tags in git-describe.
21207 Hash tags by commit SHA1 in git-describe.
21208 Use binary searching on large buckets in git-describe.
21209 Improve git-describe performance by reducing revision listing.
21210 Correct priority of lightweight tags in git-describe.
21211 Remove hash in git-describe in favor of util slot.
21212 Use nice names in conflict markers during cherry-pick/revert.
21213 Document the master@{n} reflog query syntax.
21214 Refer users to git-rev-parse for revision specification syntax.
21215 Document pack .idx file format upgrade strategy.
21217 Simon 'corecode' Schubert (2):
21218 Use fixed-size integers for the on-disk pack structure.
21219 Use standard -t option for touch.
21221 Uwe Kleine-König (4):
21222 document --exec for git-push
21223 Update documentation of fetch-pack, push and send-pack
21224 make --exec=... option to git-push configurable
21225 rename --exec to --receive-pack for push and send-pack
21228 Version v1.5.0-rc1; changes since v1.5.0-rc0:
21229 ---------------------------------------------
21232 Speed-up recursive by flushing index only once for all entries
21234 Alexandre Julliard (12):
21235 Shallow clone: do not ignore shallowness when following tags
21236 fetch-pack: Properly remove the shallow file when it becomes empty.
21237 upload-pack: Check for NOT_SHALLOW flag before sending a shallow to the client.
21238 git-fetch: Reset shallow_depth before auto-following tags.
21239 get_shallow_commits: Avoid memory leak if a commit has been reached already.
21240 fetch-pack: Do not fetch tags for shallow clones.
21241 git-clean: Fix the -q option.
21242 git.el: Don't use --info-only when resolving a file.
21243 git.el: Avoid setting font lock keywords before entering log-edit mode.
21244 git-apply: Remove directories that have become empty after deleting a file.
21245 git-clone: Make sure the master branch exists before running cat on it.
21246 git.el: Define the propertize function if needed, for XEmacs compatibility.
21249 hooks/commit-msg: add example to add Signed-off-by line to message
21251 Andy Whitcroft (6):
21252 send pack check for failure to send revisions list
21253 ssh-upload: prevent buffer overrun
21254 short i/o: clean up the naming for the write_{in,or}_xxx family
21255 short i/o: fix calls to read to use xread or read_in_full
21256 short i/o: fix calls to write to use xwrite or write_in_full
21257 short i/o: fix config updates to use write_in_full
21259 Brian Gernhardt (3):
21260 Add documentation for git-branch's color configuration.
21261 Ignore git-init and git-remote
21262 Auto-quote config values in config.c:store_write_pair()
21265 git-svn: quiet down tests and fix some unportable shell constructs
21266 git-svn: dcommit should diff against the current HEAD after committing
21267 t6024-recursive-merge: quiet down this test
21268 test-lib: quiet down init-db output for tests
21269 t9200-git-cvsexportcommit.sh: quiet down commit
21270 git-svn: remove non-delta fetch code paths
21271 git-svn: print out the SVN library version in --version, too
21272 git-svn: verify_ref() should actually --verify
21273 git-svn: sort multi-init output
21274 git-svn: remove svnadmin dependency from the tests
21275 git-svn: t/t9100-git-svn-basic: remove old check for NO_SYMLINK
21276 git-svn: t/t91??-*: optimize the tests a bit
21277 instaweb: load Apache mime and dir modules if they are needed
21278 git-svn: make multi-init less confusing
21279 git-svn: update documentation for multi-{init|fetch}
21280 git-svn: make --repack work consistently between fetch and multi-fetch
21281 Documentation/git-svn: clarify dcommit, rebase vs pull/merge
21282 git-svn: fix show-ignore
21283 git-svn: add --prefix= option to multi-init
21284 git-svn: pass an unambiguous ref to rev-list when grafting-branches
21285 Avoid errors and warnings when attempting to do I/O on zero bytes
21287 Fredrik Kuivinen (1):
21288 instaweb: Nicer error message when the http daemon isn't found
21290 J. Bruce Fields (9):
21291 Docs: update cvs-migration.txt to reflect clone's new default behavior
21292 Documentation: update git-clone.txt for clone's new default behavior
21293 Documentation: update glossary entry for "origin"
21294 Documentation: update tutorial's discussion of origin
21295 Documentation: update git-pull.txt for new clone behavior
21296 Documentation: remove master:origin example from pull-fetch-param.txt
21297 Documentation: tutorial editing
21298 Documentation: clarify definition of "reachable"
21299 Documentation: add git-remote man page
21301 Jakub Narebski (14):
21302 gitweb: Add mod_perl version string to "generator" meta header
21303 gitweb: Precompile CGI routines for mod_perl
21304 Add info about new test families (8 and 9) to t/README
21305 gitweb: Fix error in git_project_index subroutine
21306 gitweb: Fix bug in git_difftree_body (was '!=' instead of 'ne')
21307 gitweb: There can be empty patches (in git_patchset_body)
21308 gitweb: Fix "Use of uninitialized value" warning in git_tags_body
21309 gitweb: Fix error in git_patchest_body for file creation/deletion patch
21310 gitweb: Fix error in "rename to"/"copy to" git diff header output
21311 gitweb: Fix errors in git_patchset_body for empty patches
21312 Revert "gitweb: There can be empty patches (in git_patchset_body)"
21313 gitweb: Fix split patches output (e.g. file to symlink)
21314 gitweb: Remove superfluous "|" in "commit" view
21315 gitweb: Fix git_patchset_body not closing <div class="patch">
21318 get_tree_entry: map blank requested entry to tree root
21321 update hook: redirect _both_ diagnostic lines to stderr upon tag failure
21323 Johannes Schindelin (9):
21324 upload-pack: no longer call rev-list
21325 support fetching into a shallow repository
21326 allow cloning a repository "shallowly"
21327 allow deepening of a shallow repository
21328 add tests for shallow stuff
21329 xdl_merge(): fix a segmentation fault when refining conflicts
21330 Fix yet another subtle xdl_merge() bug
21331 Sanitize for_each_reflog_ent()
21332 Fix t1410 for core.filemode==false
21334 Junio C Hamano (106):
21335 We should make sure that the protocol is still extensible.
21336 Why does it mean we do not have to register shallow if we have one?
21337 Why didn't we mark want_obj as ~UNINTERESTING in the old code?
21338 shallow clone: unparse and reparse an unshallowed commit
21339 add for_each_reflog_ent() iterator
21340 Protect commits recorded in reflog from pruning.
21341 Teach git-repack to preserve objects referred to by reflog entries.
21342 reflog: fix warning message.
21343 Move in_merge_bases() to commit.c
21345 reflog expire: prune commits that are not incomplete
21346 reflog expire: do not punt on tags that point at non commits.
21347 show-branch --reflog: add documentation.
21348 Document --numstat in git-apply and git-diff
21349 Document git-reset <commit> -- <paths>...
21350 Move encoding conversion routine out of mailinfo to utf8.c
21351 i18n.logToUTF8: convert commit log message to UTF-8
21352 Teach log family --encoding
21353 everyday: update for v1.5.0
21354 count-objects -v: show number of packs as well.
21355 rerere gc: honor configuration and document it
21356 git-reflog: gc.* configuration and documentation.
21357 everyday: replace a few 'prune' and 'repack' with 'gc'
21358 Use 'repack -a -d -l' instead of 'repack -a -d' in git-gc
21359 Set NO_MMAP for Cygwin by default
21360 UTF-8: introduce i18n.logoutputencoding.
21361 gcc does not necessarily pass runtime libpath with -R
21362 Work around http-fetch built with cURL 7.16.0
21363 Rename t3900 test vector file
21364 t3900: test conversion to non UTF-8 as well
21365 GIT_SKIP_TESTS: allow users to omit tests that are known to break
21366 core.logallrefupdates: log remotes/ tracking branches.
21367 Allow non-fast-forward of remote tracking branches in default clone
21368 t5400 send-pack test: try a bit more nontrivial transfer.
21369 Revert "read_directory: show_both option."
21370 Fix 'git add' with .gitignore
21371 pack-objects: fix use of use_pack().
21372 mmap: set FD_CLOEXEC for file descriptors we keep open for mmap()
21373 send-pack: fix pipeline.
21374 Documentation: illustrate send-pack pipeline.
21375 commit re-encoding: fix confusion between no and default conversion.
21376 t3900: test log --encoding=none
21377 Documentation: i18n commit log message notes.
21378 Documentation: minor rewording for git-log and git-show pages.
21379 Move commit reencoding parameter parsing to revision.c
21380 commit-tree: cope with different ways "utf-8" can be spelled.
21381 i18n: drop "encoding" header in the output after re-coding.
21382 Documentation/config.txt (and repo-config manpage): mark-up fix.
21383 Update documentation for update hook.
21384 send-pack.c: use is_null_sha1()
21385 send-pack: tell pack-objects to use its internal rev-list.
21386 Do not merge random set of refs out of wildcarded refs
21387 i18n: do not leak 'encoding' header even when we cheat the conversion.
21388 Update send-pack pipeline documentation.
21389 fail pull/merge early in the middle of conflicted merge
21390 git-fetch: remove .keep file at the end.
21391 Strongly discourage --update-head-ok in fetch-options documentation.
21392 Update clone/fetch documentation with --depth (shallow clone) option
21393 Remove unused variable (git-commit.sh)
21394 fetch-pack: do not use lockfile structure on stack.
21395 Fix infinite loop when deleting multiple packed refs.
21396 tutorial: misc updates.
21397 git-verify-tag: make sure we remove temporary file.
21398 pack-check.c::verify_packfile(): don't run SHA-1 update on huge data
21399 rerere: Fix removal of already resolved path.
21401 builtin-prune: memory diet.
21402 Fix timestamp for test-tick
21403 builtin-prune: make file-scope static struct to an argument.
21404 builtin-prune: separate ref walking from reflog walking.
21405 Move traversal of reachable objects into a separate library.
21406 reflog expire --fix-stale
21407 reflog --fix-stale: do not check the same trees and commits repeatedly.
21408 diff-index --cached --raw: show tree entry on the LHS for unmerged entries.
21409 git-reset <tree> -- <path> restores absense of <path> in <tree>
21410 Spell default packedgitlimit slightly differently
21411 Move initialization of log_all_ref_updates
21412 Introduce is_bare_repository() and core.bare configuration variable
21413 git-fetch: allow updating the current branch in a bare repository.
21414 git-status: show detached HEAD
21415 Detached HEAD (experimental)
21416 git-checkout: do not warn detaching HEAD when it is already detached.
21417 git-checkout: rewording comments regarding detached HEAD.
21418 git-checkout: safety when coming back from the detached HEAD state.
21419 git-checkout: fix branch name output from the command
21420 --utf8 is now default for 'git-am'
21421 --prune is now default for 'pack-refs'
21422 rm git-rerere.perl -- it is now a built-in.
21423 merge-base: do not leak commit list
21424 Do not ignore a detected patchfile brokenness.
21425 Fix "Do not ignore a detected patchfile brokenness."
21426 builtin-archive: do not free a tree held by the object layer.
21427 git-checkout: safety check for detached HEAD checks existing refs
21428 git-checkout: handle local changes sanely when detaching HEAD
21429 git-am: should work when "--no-utf8 --utf8" is given
21430 -u is now default for 'git-applymbox'
21431 -u is now default for 'git-mailinfo'.
21432 Makefile: remove $foo when $foo.exe is built/installed.
21433 merge-recursive: do not use on-file index when not needed.
21435 index-pack: write-or-die instead of unchecked write-in-full.
21436 config-set: check write-in-full returns in set_multivar
21437 git-rm: do not fail on already removed file.
21438 git-status: wording update to deal with deleted files.
21439 plug a few leaks in revision walking used in describe.
21443 Clarify syntax and role of git-add in status output
21444 Improve "nothing to commit" part of status output
21445 Support --amend on initial commit in status output
21446 Improve cached content header of status output
21447 Remove unnecessary git-rm --cached reference from status output
21448 send-email: work around double encoding of in-body From field.
21449 Provide better feedback for the untracked only case in status output
21452 Skip excessive blank lines before commit body
21453 Refactor print-functions in builtin-branch
21454 git-branch: show detached HEAD
21456 Linus Torvalds (3):
21457 write-cache: do not leak the serialized cache-tree data.
21458 write_in_full: really write in full or return error on disk full.
21459 Better error messages for corrupt databases
21462 Blame "linenr" link jumps to previous state at "orig_lineno"
21464 Martin Langhoff (6):
21465 cvsimport: skip commits that are too recent
21466 cvsimport: skip commits that are too recent (option and documentation)
21467 cvsimport: document -S and -L options
21468 cvsimport: cleanup temporary cvsps file
21469 cvsserver: detect early of we are up to date and avoid costly rev-list
21470 cvsserver: fix revision number during file adds
21472 Michael Loeffler (1):
21473 git-commit: do not fail to print the diffstat even if there is a file named HEAD
21476 add .mailmap for git-shortlog output with the git repository
21477 Add git-reflog to .gitignore
21478 move git-blame to its place in .gitignore
21479 "init-db" can really be just "init"
21480 Add git-init documentation.
21483 Fix warnings in sha1_file.c - use C99 printf format if available
21486 git-send-email: default value for "From:" field.
21489 Make check target depend on common-cmds.h
21490 Remove shadowing variable from traverse_trees()
21491 Set default "tar" umask to 002 and owner.group to root.root
21493 Robert Fitzsimons (2):
21494 gitweb: Re-enable rev-list --parents for parse_commit.
21495 gitweb: Fix shortlog only showing HEAD revision.
21498 Documentation/tutorial: misc updates
21499 git-tag: add flag to verify a tag
21501 Sasha Khapyorsky (3):
21502 git-svnimport: support for incremental import
21503 git-svnimport: clean svn path when accessing SVN repo
21504 git-svnimport: fix edge revisions double importing
21506 Shawn O. Pearce (49):
21507 Don't crash during repack of a reflog with pruned commits.
21508 Create 'git gc' to perform common maintenance operations.
21509 Use GIT_REFLOG_ACTION environment variable instead.
21510 Honor GIT_REFLOG_ACTION in git-rebase.
21511 Use branch names in 'git-rebase -m' conflict hunks.
21512 Ensure `git-pull` fails if `git-merge` fails.
21513 Honor pull.{twohead,octopus} in git-merge.
21514 Allow git-merge to select the default strategy.
21515 Move better_branch_name above get_ref in merge-recursive.
21516 Allow merging bare trees in merge-recursive.
21517 Use merge-recursive in git-am -3.
21518 Replace unpack_entry_gently with unpack_entry.
21519 Introduce new config option for mmap limit.
21520 Refactor packed_git to prepare for sliding mmap windows.
21521 Use off_t for index and pack file lengths.
21522 Create read_or_die utility routine.
21523 Refactor how we open pack files to prepare for multiple windows.
21524 Replace use_packed_git with window cursors.
21525 Loop over pack_windows when inflating/accessing data.
21526 Document why header parsing won't exceed a window.
21527 Unmap individual windows rather than entire files.
21528 Fully activate the sliding window pack access.
21529 Load core configuration in git-verify-pack.
21530 Ensure core.packedGitWindowSize cannot be less than 2 pages.
21531 Improve error message when packfile mmap fails.
21532 Support unmapping windows on 'temporary' packfiles.
21533 Create pack_report() as a debugging aid.
21534 Test suite for sliding window mmap implementation.
21535 Default core.packdGitWindowSize to 1 MiB if NO_MMAP.
21536 Release pack windows before reporting out of memory.
21537 Replace mmap with xmmap, better handling MAP_FAILED.
21538 Cleanup read_cache_from error handling.
21539 Fix random segfaults in pack-objects.
21540 Force core.filemode to false on Cygwin.
21541 Use PATH_MAX constant for --bare.
21542 Replace "GIT_DIR" with GIT_DIR_ENVIRONMENT.
21543 Automatically detect a bare git repository.
21544 Remove unnecessary argc parameter from run_command_v.
21545 Redirect update hook stdout to stderr.
21546 Use /dev/null for update hook stdin.
21547 Teach Git how to parse standard power of 2 suffixes.
21548 Update packedGit config option documentation.
21549 Add test case for update hooks in receive-pack.
21550 Increase packedGit{Limit,WindowSize} on 64 bit systems.
21551 Don't die in git-http-fetch when fetching packs.
21552 Don't save the commit buffer in git-describe.
21553 Make git-describe a builtin.
21554 Disallow working directory commands in a bare repository.
21555 Chose better tag names in git-describe after merges.
21557 Stefan-W. Hahn (1):
21558 Replacing the system call pread() with lseek()/xread()/lseek() sequence.
21561 Describe git-clone's actual behavior in the summary
21562 Print a more accurate error message when we fail to create a lock file.
21563 Update git-svn manpage to remove the implication that SVN::* is optional.
21566 Fix formatting for urls section of fetch, pull, and push manpages
21567 Fix formatting for urls section of fetch, pull, and push manpages
21570 Version v1.5.0-rc0; changes since v1.4.4.4:
21571 -------------------------------------------
21574 Make perl/ build procedure ActiveState friendly.
21576 Alexandre Julliard (1):
21577 vc-git: Ignore errors caused by a non-existent directory in vc-git-registered.
21579 Andreas Ericsson (2):
21580 ls-files: Give hints when errors happen.
21581 git-diff: Introduce --index and deprecate --cached.
21584 Improve git-prune -n output
21585 Add support to git-branch to show local and remote branches
21586 Use .git/config for storing "origin" shortcut repository
21587 De-emphasise the symbolic link documentation.
21588 Explicitly add the default "git pull" behaviour to .git/config on clone
21589 Colourise git-branch output
21590 Allow subcommand.color and color.subcommand color configuration
21591 git-status always says what branch it's on
21593 Aneesh Kumar K.V (1):
21594 Add config example with respect to branch
21596 Brian Gernhardt (6):
21597 Add --add option to git-repo-config
21598 Make git-diff documentation use [--] when it should.
21599 Add documentation for show-branch --topics
21600 Remove COLLISION_CHECK from Makefile since it's not used.
21601 Keep "git --git-dir" from causing a bus error.
21602 Make git-show-branch options similar to git-branch.
21604 David S. Miller (1):
21605 Pass -M to diff in request-pull
21608 git-svn: handle authentication without relying on cached tokens on disk
21609 git-svn: correctly access repos when only given partial read permissions
21610 git-svn: exit with status 1 for test failures
21611 git-svn: allow SVN:: lib users to track the root of the repository (again)
21612 git-svn: use ~/.subversion config files when using SVN:: libraries
21613 git-svn: enable delta transfers during fetches when using SVN:: libs
21614 git-svn: update tests for recent changes
21615 git-svn: error out when the SVN connection fails during a fetch
21616 git-svn: fix output reporting from the delta fetcher
21617 git-svn: color support for the log command
21618 git-svn: documentation updates
21619 git-svn: fix multi-init
21620 git-svn: avoid network timeouts for long-running fetches
21621 git-svn: extra error check to ensure we open a file correctly
21622 git-svn: use do_switch for --follow-parent if the SVN library supports it
21623 rerere: add clear, diff, and status commands
21624 rerere: record (or avoid misrecording) resolved, skipped or aborted rebase/am
21625 git-svn: enable logging of information not supported by git
21626 git-svn: allow dcommit to take an alternate head
21627 git-svn: correctly display fatal() error messages
21628 git-svn: correctly handle packed-refs in refs/remotes/
21629 git-svn: correctly handle "(no author)" when using an authors file
21630 git-svn: convert to using Git.pm
21631 git-svn: remove support for the svn command-line client
21632 git-svn: rename 'commit' command to 'set-tree'
21633 git-cvsserver: fix breakage when calling git merge-file
21634 Remove NO_ACCURATE_DIFF options from build systems
21635 git-svn: enable common fetch/commit options for dcommit
21636 Makefile: add quick-install-doc for installing pre-built manpages
21638 Han-Wen Nienhuys (2):
21639 git-tag: allow empty tag message if -m is given explicitly.
21640 ident.c: Trim hint printed when gecos is empty.
21643 git-cvsimport: add support for CVS pserver method HTTP/1.x proxying
21645 J. Bruce Fields (5):
21646 Documentation: clarify tutorial pull/merge discussion
21647 cvs-migration: improved section titles, better push/commit explanation
21648 Documentation: reorganize cvs-migration.txt
21649 Documentation: update git-clone man page with new behavior
21650 Documentation: simpler shared repository creation
21652 Jakub Narebski (26):
21653 gitweb: Protect against possible warning in git_commitdiff
21654 gitweb: Buffer diff header to deal with split patches + git_patchset_body refactoring
21655 gitweb: Default to $hash_base or HEAD for $hash in "commit" and "commitdiff"
21656 gitweb: New improved formatting of chunk header in diff
21657 gitweb: Add an option to href() to return full URL
21658 gitweb: Refactor feed generation, make output prettier, add Atom feed
21659 gitweb: Finish restoring "blob" links in git_difftree_body
21660 gitweb: Replace SPC with also in tag comment
21661 gitweb: Do not use esc_html in esc_path
21662 gitweb: Use git-show-ref instead of git-peek-remote
21663 gitweb: Add author and committer email extraction to parse_commit
21664 gitweb: Add author and contributor email to Atom feed
21665 gitweb: Use author_epoch for pubdate in gitweb feeds
21666 gitweb: Make project description in projects list link to summary view
21667 gitweb: Fix Atom feed <logo>: it is $logo, not $logo_url
21668 git-clone: Rename --use-immingled-remote option to --no-separate-remote
21669 Document git-diff whitespace flags -b and -w
21670 gitweb: Allow PNG, GIF, JPEG images to be displayed in "blob" view
21671 gitweb: Don't use Content-Encoding: header in git_snapshot
21672 gitweb: Show target of symbolic link in "tree" view
21673 gitweb: Add generic git_object subroutine to display object of any type
21674 gitweb: Hyperlink target of symbolic link in "tree" view (if possible)
21675 gitweb: SHA-1 in commit log message links to "object" view
21676 gitweb: Do not show difftree for merges in "commit" view
21677 gitweb: Add title attribute to ref marker with full ref name
21678 gitweb: Add "next" link to commit view
21681 shortlog: fix segfault on empty authorname
21682 vim syntax: follow recent changes to commit template
21685 Set permissions of each new file before "cvs add"ing it.
21687 Johannes Schindelin (30):
21689 shortlog: do not crash on parsing "[PATCH"
21690 shortlog: read mailmap from ./.mailmap again
21691 shortlog: handle email addresses case-insensitively
21693 shortlog: use pager
21694 sha1_object_info(): be consistent with read_sha1_file()
21695 xdiff: add xdl_merge()
21696 xdl_merge(): fix an off-by-one bug
21697 xdl_merge(): fix thinko
21698 diff -b: ignore whitespace at end of line
21699 xdl_merge(): fix and simplify conflict handling
21700 cvs-migration document: make the need for "push" more obvious
21701 Add builtin merge-file, a minimal replacement for RCS merge
21702 merge-file: support -p and -q; fix compile warnings
21703 Get rid of the dependency on RCS' merge program
21704 merge-recursive: add/add really is modify/modify with an empty base
21705 INSTALL: no need to have GNU diff installed
21706 git-show: grok blobs, trees and tags, too
21707 Document git-merge-file
21708 add a function to rename sections in the config
21709 git-branch: rename config vars branch.<branch>.*, too
21710 Introduce GIT_TEMPLATE_DIR
21711 Use git-merge-file in git-merge-one-file, too
21712 git-tag: support -F <file> option
21713 git-reset --hard: tell the user what the HEAD was reset to
21714 move read_mmfile() into xdiff-interface
21715 Add a test for git-rerere
21716 Make git-rerere a builtin
21717 commit-tree: encourage UTF-8 commit messages.
21719 Josef Weidendorfer (2):
21720 Add branch.*.merge warning and documentation update
21721 Move "no merge candidate" warning into git-pull
21723 Junio C Hamano (115):
21724 upload-pack: stop the other side when they have more roots than we do.
21725 apply --numstat: mark binary diffstat with - -, not 0 0
21726 pack-objects: tweak "do not even attempt delta" heuristics
21727 Store peeled refs in packed-refs file.
21728 remove merge-recursive-old
21729 git-merge: make it usable as the first class UI
21730 merge: allow merging into a yet-to-be-born branch.
21731 Store peeled refs in packed-refs (take 2).
21732 git-fetch: reuse ls-remote result.
21733 git-fetch: fix dumb protocol transport to fetch from pack-pruned ref
21734 git-fetch: allow glob pattern in refspec
21735 refs outside refs/{heads,tags} match less strongly.
21736 Typefix builtin-prune.c::prune_object()
21737 Allow git push to delete remote ref.
21738 gitweb: (style) use chomp without parentheses consistently.
21739 git-clone: stop dumb protocol from copying refs outside heads/ and tags/.
21740 git-branch -D: make it work even when on a yet-to-be-born branch
21741 git-shortlog: fix common repository prefix abbreviation.
21742 git-shortlog: make common repository prefix configurable with .mailmap
21743 git-commit: show --summary after successful commit.
21744 git-fetch: exit with non-zero status when fast-forward check fails
21745 git-fetch: allow forcing glob pattern in refspec
21746 fetch-pack: do not barf when duplicate re patterns are given
21747 grep: do not skip unmerged entries when grepping in the working tree.
21748 git-merge: tighten error checking.
21749 git-merge: do not leak rev-parse output used for checking internally.
21750 cvsimport: style fixup.
21751 git-merge: fix confusion between tag and branch
21752 xmerge: make return value from xdl_merge() more usable.
21753 merge-recursive: use xdl_merge().
21754 read-tree: further loosen "working file will be lost" check.
21755 Loosen "working file will be lost" check in Porcelain-ish
21756 read-tree: document --exclude-per-directory
21757 git-merge: squelch needless error message.
21758 git-merge: fix "fix confusion between tag and branch" for real
21760 git-rerere: add 'gc' command.
21761 Documentation/git-commit: rewrite to make it more end-user friendly.
21762 git-commit: allow --only to lose what was staged earlier.
21763 shortlog: remove "[PATCH]" prefix from shortlog output
21764 shortlog: fix segfault on empty authorname
21765 diff --numstat: show binary with '-' to match "apply --numstat"
21766 add test case for recursive merge
21767 git-push: document removal of remote ref with :<dst> pathspec
21768 Revert "git-diff: Introduce --index and deprecate --cached."
21769 git merge: reword failure message.
21770 spurious .sp in manpages
21771 git-push: accept tag <tag> as advertised.
21772 send-pack: tighten checks for remote names
21773 branch --color: change default color selection.
21774 git-blame: show lines attributed to boundary commits differently.
21775 config documentation: group color items together.
21776 git-svn: allow both diff.color and color.diff
21777 Update git-diff documentation
21778 git-fetch: make it work from within a subdirectory.
21779 git-reset: make it work from within a subdirectory.
21780 git-reset [--mixed] <tree> [--] <paths>...
21781 merge: give a bit prettier merge message to "merge branch~$n"
21782 git-clone: use wildcard specification for tracking branches
21783 git-pull: refuse default merge without branch.*.merge
21784 git-clone: lose the artificial "first" fetch refspec
21785 git-clone: lose the traditional 'no-separate-remote' layout
21786 update-index: make D/F conflict error a bit more verbose.
21787 git-add: remove conflicting entry when adding.
21788 Fix check_file_directory_conflict().
21789 Fix mis-mark-up in git-merge-file.txt documentation
21790 markup fix in svnimport documentation.
21791 rev-list --left-right
21792 Teach all of log family --left-right output.
21793 Make left-right automatic.
21794 Teach show-branch how to show ref-log data.
21795 git-fetch: Avoid reading packed refs over and over again
21796 avoid accessing _all_ loose refs in git-show-ref --verify
21797 show-ref: fix --quiet --verify
21798 show-ref: fix --verify --hash=length
21799 parse-remote::expand_refs_wildcard()
21800 show-ref: fix --exclude-existing
21801 racy-git: documentation updates.
21802 rerere: fix breakage of resolving.
21803 fix testsuite: make sure they use templates freshly built from the source
21804 Teach git-branch to delete tracking branches with -r -d
21805 blame: -b (blame.blankboundary) and --root (blame.showroot)
21806 git-add --interactive
21807 git-add --interactive: hunk splitting
21808 Revert "fix testsuite: make sure they use templates freshly built from the source"
21809 Do not create $GIT_DIR/remotes/ directory anymore.
21810 Use preprocessor constants for environment variable names.
21811 Revert "Make left-right automatic."
21812 fix populate-filespec
21813 config_rename_section: fix FILE* leak
21814 simplify inclusion of system header files.
21815 revision: --skip=<n>
21816 git-add: error out when given no arguments.
21817 compat/inet_ntop: do not use u_int
21818 diff documentation: mostly talk about <commit>
21819 Revert "git-pull: refuse default merge without branch.*.merge"
21820 parse-remote: mark all refs not for merge only when fetching more than one
21821 _XOPEN_SOURCE problem also exists on FreeBSD
21822 commit-tree: do not overflow MAXPARENT
21823 merge and reset: adjust for "reset --hard" messages
21824 default pull: forget about "newbie protection" for now.
21825 Do not support "partial URL shorthand" anymore.
21826 Really fix headers for __FreeBSD__
21827 git-tag: lose exit after die
21828 Allow branch.*.merge to talk about remote tracking branches.
21829 git-add --interactive: add documentation
21830 match_pathspec() -- return how well the spec matched
21831 git-rm: update to saner semantics
21832 t3600: update the test for updated git rm
21833 git-rm: Documentation
21834 read_directory: show_both option.
21835 git-add: add ignored files when asked explicitly.
21836 git-add: warn when adding an ignored file with an explicit request.
21837 git-add -f: allow adding otherwise ignored files.
21841 Add -v and --abbrev options to git-branch
21842 git-branch: add options and tests for branch renaming
21843 rename_ref: use lstat(2) when testing for symlink
21844 git-branch: let caller specify logmsg
21849 Michael Loeffler (1):
21850 git-fetch: ignore dereferenced tags in expand_refs_wildcard
21852 Nicolas Pitre (11):
21853 builtin git-shortlog is broken
21854 pack-objects: remove redundent status information
21855 make 'git add' a first class user friendly interface to the index
21856 change the unpack limit treshold to a saner value
21857 repacked packs should be read-only
21858 make commit message a little more consistent and conforting
21859 make patch_delta() error cases a bit more verbose
21860 make git a bit less cryptic on fetch errors
21861 index-pack usage of mmap() is unacceptably slower on many OSes other than Linux
21862 clarify some error messages wrt unknown object types
21863 checkout: make the message about the need for a new branch a bit clearer
21865 Paul Mackerras (1):
21866 gitk: Fix enabling/disabling of menu items on Mac OS X
21869 config option log.showroot to show the diff of root commits
21872 Make git-clone --use-separate-remote the default
21875 git-clone documentation
21876 Documentation: new option -P for git-svnimport
21877 git-branch -d: do not stop at the first failure.
21878 Documentation/git-branch: new -r to delete remote-tracking branches.
21881 shortlog: remove range check
21883 Robert Fitzsimons (17):
21884 gitweb: Show '...' links in "summary" view only if there are more items
21885 gitweb: Add missing show '...' links change.
21886 gitweb: optimize git_get_last_activity.
21887 gitweb: optimize git_shortlog_body.
21888 gitweb: optimize git_summary.
21889 gitweb: Use rev-list pattern search options.
21890 gitweb: Require a minimum of two character for the search text.
21891 gitweb: Allow search to be disabled from the config file.
21892 gitweb: Paginate commit/author/committer search output
21893 gitweb: Add parse_commits, used to bulk load commit objects.
21894 gitweb: We do longer need the --parents flag in rev-list.
21895 gitweb: Change summary, shortlog actions to use parse_commits.
21896 gitweb: Change log action to use parse_commits.
21897 gitweb: Change header search action to use parse_commits.
21898 gitweb: Change atom, rss actions to use parse_commits.
21899 gitweb: Change history action to use parse_commits.
21900 gitweb: Use rev-list --skip option.
21902 Robin Rosenberg (1):
21903 Make cvsexportcommit work with filenames with spaces and non-ascii characters.
21905 Sean Estabrooks (1):
21906 Update documentation to remove incorrect GIT_DIFF_OPTS example.
21908 Shawn O. Pearce (30):
21909 Teach git-completion.bash how to complete git-merge.
21910 Hide plumbing/transport commands from bash completion.
21911 Teach bash how to complete options for git-name-rev.
21912 Add current branch in PS1 support to git-completion.bash.
21913 Teach bash how to complete git-format-patch.
21914 Teach bash how to complete git-cherry-pick.
21915 Teach bash how to complete git-rebase.
21916 Teach bash about git log/show/whatchanged options.
21917 Support bash completion of refs/remote.
21918 Teach bash about git-repo-config.
21919 Support --strategy=x completion in addition to --strategy x.
21920 Cache the list of merge strategies and available commands during load.
21921 Teach bash about git-am/git-apply and their whitespace options.
21922 Teach bash how to complete long options for git-commit.
21923 Fix broken bash completion of local refs.
21924 Remove uncontested renamed files during merge.
21925 Avoid accessing a slow working copy during diffcore operations.
21926 Provide more meaningful output from 'git init-db'.
21927 Enable reflogs by default in any repository with a working directory.
21928 Teach bash the new features of 'git show'.
21929 Suggest use of "git add file1 file2" when there is nothing to commit.
21930 Align section headers of 'git status' to new 'git add'.
21931 Default GIT_COMMITTER_NAME to login name in recieve-pack.
21932 Suggest 'add' in am/revert/cherry-pick.
21933 Rename imap-send's internal info/warn functions.
21934 Introduce a global level warn() function.
21935 Use extended SHA1 syntax in merge-recursive conflicts.
21936 Display 'theirs' branch name when possible in merge.
21937 Rename gitfakemmap to git_mmap.
21938 Switch git_mmap to use pread.
21940 Terje Sten Bjerkseth (1):
21941 Fix system header problems on Mac OS X
21943 Uwe Kleine-König (1):
21944 Fix documentation copy&paste typo
21947 Version v1.4.4.4; changes since v1.4.4.3:
21948 -----------------------------------------
21950 Johannes Schindelin (1):
21951 diff --check: fix off by one error
21953 Junio C Hamano (3):
21954 spurious .sp in manpages
21955 Fix infinite loop when deleting multiple packed refs.
21956 pack-check.c::verify_packfile(): don't run SHA-1 update on huge data
21959 Version v1.4.4.3; changes since v1.4.4.2:
21960 -----------------------------------------
21963 Clarify fetch error for missing objects.
21965 Brian Gernhardt (1):
21966 Move Fink and Ports check to after config file
21969 no need to install manpages as executable
21972 git-svn: exit with status 1 for test failures
21973 git-svn: correctly display fatal() error messages
21976 Don't use memcpy when source and dest. buffers may overlap
21978 Junio C Hamano (1):
21981 Martin Langhoff (1):
21982 cvsserver: Avoid miscounting bytes in Perl v5.8.x
21984 Shawn O. Pearce (2):
21985 Make sure the empty tree exists when needed in merge-recursive.
21986 Bypass expensive content comparsion during rename detection.
21989 Version v1.4.4.2; changes since v1.4.4.1:
21990 -----------------------------------------
21993 git-blame: fix rev parameter handling.
21996 Increase length of function name buffer
21997 Document git-repo-config --bool/--int options.
22000 git-svn: error out from dcommit on a parent-less commit
22001 git-svn: correctly handle revision 0 in SVN repositories
22002 git-svn: preserve uncommitted changes after dcommit
22003 git-svn: avoid fetching files twice in the same revision
22005 Johannes Schindelin (1):
22006 git-mv: search more precisely for source directory in index
22008 Junio C Hamano (5):
22009 git blame -C: fix output format tweaks when crossing file boundary.
22010 tutorial: talk about user.name early and don't start with commit -a
22011 receive-pack: do not insist on fast-forward outside refs/heads/
22012 unpack-trees: make sure "df_conflict_entry.name" is NUL terminated.
22013 git-reset to remove "$GIT_DIR/MERGE_MSG"
22016 archive-zip: don't use sizeof(struct ...)
22019 Version v1.4.4.1; changes since v1.4.4:
22020 ---------------------------------------
22022 Alexandre Julliard (1):
22023 gitweb: Put back shortlog instead of graphiclog in the project list.
22026 Move --pretty options into Documentation/pretty-formats.txt
22029 Run "git repack -a -d" once more at end, if there's 1MB or more of not-packed data.
22031 Johannes Schindelin (1):
22032 Seek back to current filepos when mmap()ing with NO_MMAP
22034 Junio C Hamano (7):
22035 git-checkout: do not allow -f and -m at the same time.
22036 git-checkout: allow pathspec to recover lost working tree directory
22037 convert-objects: set _XOPEN_SOURCE to 600
22038 git-fetch: follow lightweit tags as well.
22039 do_for_each_ref: perform the same sanity check for leftovers.
22040 trust-executable-bit: fix breakage for symlinks
22043 Linus Torvalds (2):
22044 git-pull: allow pulling into an empty repository
22045 "git fmt-merge-msg" SIGSEGV
22048 archive: use setvbuf() instead of setlinebuf()
22050 Paolo Ciarrocchi (2):
22051 Teach SubmittingPatches about git-commit -s
22052 Doc: Make comment about merging in tutorial.txt more clear
22055 Fix git-for-each-refs broken for tags
22056 git-apply: Documentation typo fix
22057 Documentation: Define symref and update HEAD description
22058 Documentation: Correct alternates documentation, document http-alternates
22061 sparse fix: non-ANSI function declaration
22062 sparse fix: Using plain integer as NULL pointer
22063 git-apply: slightly clean up bitfield usage
22064 Document git-runstatus
22067 Version v1.4.4; changes since v1.4.4-rc2:
22068 -----------------------------------------
22071 test-lib.sh: A command dying due to a signal is an unexpected failure.
22072 Catch errors when writing an index that contains invalid objects.
22075 git-update-index(1): fix use of quoting in section title
22077 Junio C Hamano (1):
22080 Robin Rosenberg (1):
22081 Rework cvsexportcommit to handle binary files for all cases.
22084 Version v1.4.4-rc2; changes since v1.4.4-rc1:
22085 ---------------------------------------------
22088 git-svn: avoid printing filenames of files we're not tracking
22089 git-svn: don't die on rebuild when --upgrade is specified
22090 git-svn: fix dcommit losing changes when out-of-date from svn
22092 Jakub Narebski (3):
22093 gitweb: Better git-unquoting and gitweb-quoting of pathnames
22094 gitweb: Use character or octal escape codes (and add span.cntrl) in esc_path
22095 gitweb: New improved patchset view
22097 Junio C Hamano (14):
22098 gitweb: fix disabling of "forks"
22099 gitweb: minimally fix "fork" support.
22100 gitweb: do not give blame link unconditionally in diff-tree view
22101 git-status: quote LF in its output
22102 git-pickaxe: retire pickaxe
22103 gitweb: protect blob and diff output lines from controls.
22104 gitweb: protect commit messages from controls.
22105 gitweb: fix unmatched div in commitdiff
22106 Documentation: move blame examples
22107 git-annotate: no need to exec blame; it is built-in now.
22108 git-annotate: fix -S on graft file with comments.
22109 path-list: fix path-list-insert return value
22110 git-cvsserver: read from git with -z to get non-ASCII pathnames.
22113 OGAWA Hirofumi (1):
22114 gitk: Fix nextfile() and add prevfile()
22117 Nicer error messages in case saving an object to db goes wrong
22119 Robert Shearman (1):
22120 git-rebase: Use --ignore-if-in-upstream option when executing git-format-patch.
22123 Version v1.4.4-rc1; changes since v1.4.3.5:
22124 -------------------------------------------
22127 Gitweb - provide site headers and footers
22129 Alexandre Julliard (5):
22130 pack-refs: Store the full name of the ref even when packing only tags.
22131 git.el: Added functions for moving to the next/prev unmerged file.
22132 git.el: Added a function to open the current file in another window.
22133 git.el: Move point after the log message header when entering log-edit mode.
22134 git.el: Include MERGE_MSG in the log-edit buffer even when not committing a merge.
22137 Make filenames line up in git-status output
22138 Remove uneccessarily similar printf() from print_ref_list() in builtin-branch
22140 Andy Whitcroft (2):
22141 cvsimport: move over to using git-for-each-ref to read refs.
22142 git-for-each-ref: improve the documentation on scripting modes
22144 Aneesh Kumar K.V (1):
22145 gitweb: Remove extra "/" in path names for git_get_project_list
22147 Christian Couder (12):
22148 Add [-s|--hash] option to Linus' show-ref.
22149 Use Linus' show ref in "git-branch.sh".
22150 Document git-show-ref [-s|--hash] option.
22151 Fix show-ref usage for --dereference.
22152 Add pack-refs and show-ref test cases.
22153 When creating branch c/d check that branch c does not already exists.
22154 Uncomment test case: git branch c/d should barf if branch c exists.
22155 Fix a remove_empty_dir_recursive problem.
22156 Clean up "git-branch.sh" and add remove recursive dir test cases.
22157 Use git-update-ref to delete a tag instead of rm()ing the ref file.
22158 Check that a tag exists using show-ref instead of looking for the ref file.
22159 Do not create tag leading directories since git update-ref does it.
22161 Dennis Stosberg (3):
22162 lock_ref_sha1_basic does not remove empty directories on BSD
22163 Remove bashism from t3210-pack-refs.sh
22164 Bash completion support for aliases
22166 Dmitry V. Levin (1):
22167 git-clone: define die() and use it.
22170 Use memmove instead of memcpy for overlapping areas
22173 git-send-email: do not pass custom Date: header
22174 git-svn: avoid printing filenames of files we're not tracking
22175 git-svn: don't die on rebuild when --upgrade is specified
22177 Jakub Narebski (14):
22178 gitweb: Improve git_print_page_path
22179 gitweb: Add '..' (up directory) to tree view if applicable
22180 gitweb: Get rid of git_print_simplified_log
22181 gitweb: Filter out commit ID from @difftree in git_commit and git_commitdiff
22182 gitweb: Print commit message without title in commitdiff only if there is any
22183 gitweb: Use --no-commit-id in git_commit and git_commitdiff
22184 Documentation: Update information about <format> in git-for-each-ref
22185 gitweb: Move git_get_last_activity subroutine earlier
22186 gitweb: Add "next" link to commitdiff view
22187 gitweb: Secure against commit-ish/tree-ish with the same name as path
22188 gitweb: Use 's' regexp modifier to secure against filenames with LF
22189 gitweb: Use git-for-each-ref to generate list of heads and/or tags
22190 gitweb: Output also empty patches in "commitdiff" view
22191 gitweb: Better support for non-CSS aware web browsers
22194 wt-status: use simplified resolve_ref to find current branch
22195 gitignore: git-pack-refs is a generated file.
22196 gitignore: git-show-ref is a generated file.
22197 git-pickaxe: work properly in a subdirectory.
22200 Don't use $author_name undefined when $from contains no /\s</.
22202 Johannes Schindelin (3):
22203 Fix git-update-index --again
22204 show-branch: mark active branch with a '*' again
22205 Turn on recursive with --summary
22208 Add man page for git-show-ref
22210 Junio C Hamano (96):
22211 Add git-for-each-ref: helper for language bindings
22212 Fix t1400-update-ref test minimally
22213 fsck-objects: adjust to resolve_ref() clean-up.
22214 symbolit-ref: fix resolve_ref conversion.
22215 Add callback data to for_each_ref() family.
22216 Tell between packed, unpacked and symbolic refs.
22217 pack-refs: do not pack symbolic refs.
22218 git-pack-refs --prune
22219 pack-refs: fix git_path() usage.
22220 lock_ref_sha1_basic: remove unused parameter "plen".
22221 Clean-up lock-ref implementation
22222 update-ref: -d flag and ref creation safety.
22223 update a few Porcelain-ish for ref lock safety.
22224 Teach receive-pack about ref-log
22225 receive-pack: call setup_ident before git_config
22227 teach revision walker about --all-match.
22228 git-diff/git-apply: make diff output a bit friendlier to GNU patch (part 1)
22229 ref locking: allow 'foo' when 'foo/bar' used to exist but not anymore.
22230 refs: minor restructuring of cached refs data.
22231 lock_ref_sha1(): do not sometimes error() and sometimes die().
22232 lock_ref_sha1(): check D/F conflict with packed ref when creating.
22233 delete_ref(): delete packed ref
22234 git-branch: remove D/F check done by hand.
22235 show-ref --hash=len, --abbrev=len, and --abbrev
22236 git-fetch: adjust to packed-refs.
22237 Fix refs.c;:repack_without_ref() clean-up path
22238 gitweb: make leftmost column of blame less cluttered.
22239 git-fetch: do not look into $GIT_DIR/refs to see if a tag exists.
22240 pack-refs: use lockfile as everybody else does.
22241 gitweb: prepare for repositories with packed refs.
22242 Revert 954a6183756a073723a7c9fd8d2feb13132876b0
22243 pack-refs: call fflush before fsync.
22244 blame.c: whitespace and formatting clean-up.
22245 git-blame: --show-name (and -f)
22246 git-blame: --show-number (and -n)
22247 blame.c: move code to output metainfo into a separate function.
22248 git-send-email: do not drop custom headers the user prepared
22249 ref-log: allow ref@{count} syntax.
22250 git-send-email: real name with period need to be dq-quoted on From: line
22251 git-blame --porcelain
22252 gitweb: use blame --porcelain
22253 Make git-send-email detect mbox-style patches more readily
22254 core.logallrefupdates create new log file only for branch heads.
22255 git-pack-refs --all
22256 core.logallrefupdates thinko-fix
22257 pack-objects: document --delta-base-offset option
22258 blame: Document and add help text for -f, -n, and -p
22259 gitweb: spell "blame --porcelain" with -p
22260 git-repack: repo.usedeltabaseoffset
22262 gitweb: use for-each-ref to show the latest activity across branches
22263 ref-log: fix D/F conflict coming from deleted refs.
22264 git-pickaxe: blame rewritten.
22265 git-pickaxe -M: blame line movements within a file.
22266 git-pickaxe -C: blame cut-and-pasted lines.
22267 git-pickaxe: pagenate output by default.
22268 git-pickaxe: fix nth_line()
22269 git-pickaxe: improve "best match" heuristics
22270 git-pickaxe: introduce heuristics to avoid "trivial" chunks
22271 git-pickaxe: do not keep commit buffer.
22272 git-pickaxe: do not confuse two origins that are the same.
22273 git-pickaxe: get rid of wasteful find_origin().
22274 git-pickaxe: swap comparison loop used for -C
22275 sha1_name.c: avoid compilation warnings.
22276 t3200: git-branch testsuite update
22277 tests: merge-recursive is usable without Python
22278 merge: loosen overcautious "working file will be lost" check.
22279 merge-recursive: use abbreviated commit object name.
22280 merge-recursive: make a few functions static.
22281 merge-recursive: adjust to loosened "working file clobbered" check
22282 t6022: ignoring untracked files by merge-recursive when they do not matter
22283 Documentation: fix git-format-patch mark-up and link it from git.txt
22284 send-pack --keep: do not explode into loose objects on the receiving end.
22285 git-pickaxe: WIP to refcount origin structure.
22286 git-pickaxe: allow -Ln,m as well as -L n,m
22287 git-pickaxe: refcount origin correctly in find_copy_in_parent()
22288 git-pickaxe: tighten sanity checks.
22289 Revert "send-pack --keep: do not explode into loose objects on the receiving end."
22290 git-pickaxe: split find_origin() into find_rename() and find_origin().
22291 git-pickaxe: cache one already found path per commit.
22292 Introduce a new revision set operator <rev>^!
22293 branch: work in subdirectories.
22294 for-each-ref: "creator" and "creatordate" fields
22295 git-pickaxe: rename detection optimization
22296 git-pickaxe: simplify Octopus merges further
22297 git-pickaxe: re-scan the blob after making progress with -M
22298 git-pickaxe: re-scan the blob after making progress with -C
22299 git-pickaxe: fix origin refcounting
22300 cherry is built-in, do not ship git-cherry.sh
22301 git-blame: add internal statistics to count read blobs.
22302 git-pickaxe: optimize by avoiding repeated read_sha1_file().
22303 Document git-pack-refs and link it to git(7).
22304 git-pickaxe: -L /regexp/,/regexp/
22305 git-pickaxe: allow "-L <something>,+N"
22308 Karl Hasselström (1):
22309 ignore-errors requires cl
22312 Make git-branch a builtin
22313 Fix show-ref usagestring
22315 Linus Torvalds (8):
22316 Add "git show-ref" builtin command
22317 Teach "git checkout" to use git-show-ref
22318 Start handling references internally as a sorted in-memory list
22319 Add support for negative refs
22320 Make ref resolution saner
22321 Enable the packed refs file format
22322 Allow '-' in config variable names
22323 git push: add verbose flag and allow overriding of default target repository
22326 gitweb: blame: print commit-8 on the leading row of a commit-block
22327 gitweb: blame: Mouse-over commit-8 shows author and date
22328 gitweb: blame porcelain: lineno and orig lineno swapped
22329 git-revert with conflicts to behave as git-merge with conflicts
22330 gitweb: esc_html() author in blame
22333 gitweb: start to generate PATH_INFO URLs.
22334 gitweb: warn if feature cannot be overridden.
22336 Matthew Wilcox (1):
22337 Add --dry-run option to git-send-email
22339 Nicolas Pitre (24):
22340 introduce delta objects with offset to base
22341 teach git-unpack-objects about deltas with offset to base
22342 teach git-index-pack about deltas with offset to base
22343 make git-pack-objects able to create deltas with offset to base
22344 make pack data reuse compatible with both delta types
22345 let the GIT native protocol use offsets to delta base when possible
22346 zap a debug remnant
22347 allow delta data reuse even if base object is a preferred base
22348 index-pack: compare only the first 20-bytes of the key.
22349 add the capability for index-pack to read from a stream
22350 enable index-pack streaming capability
22351 make index-pack able to complete thin packs.
22352 add progress status to index-pack
22353 mimic unpack-objects when --stdin is used with index-pack
22354 enhance clone and fetch -k experience
22355 index-pack: minor fixes to comment and function name
22356 missing small substitution
22357 make git-push a bit more verbose
22358 Allow pack header preprocessing before unpack-objects/index-pack.
22359 git-fetch can use both --thin and --keep with fetch-pack now
22360 improve fetch-pack's handling of kept packs
22361 have index-pack create .keep file more carefully
22362 remove .keep pack lock files when done with refs update
22363 git-pack-objects progress flag documentation and cleanup
22366 Fix broken sha1 locking
22367 Fix buggy ref recording
22368 gitweb: Document features better
22369 gitweb: Fix search form when PATH_INFO is enabled
22370 bisect reset: Leave the tree in usable state if git-checkout failed
22371 gitweb: Restore object-named links in item lists
22372 gitweb: Make search type a popup menu
22373 gitweb: Do not automatically append " git" to custom site name
22374 gitweb: Show project's README.html if available
22375 gitweb: Support for 'forks'
22376 gitweb: Fix up bogus $stylesheet declarations
22379 git-archive --format=zip: use default version ID
22380 git-archive --format=zip: add symlink support
22382 Make git-cherry handle root trees
22384 Robert Shearman (2):
22385 git-rebase: Use --ignore-if-in-upstream option when executing git-format-patch.
22386 git-rebase: Add a -v option to show a diffstat of the changes upstream at the start of a rebase.
22388 Robin Rosenberg (2):
22389 Mention that pull can work locally in the synopsis
22390 Swap the porcelain and plumbing commands in the git man page
22393 Remove git-annotate.perl and create a builtin-alias for git-blame
22396 fetch: Misc output cleanup
22397 merge and resolve: Output short hashes and .. in "Updating ..."
22399 Sasha Khapyorsky (2):
22400 git-svnimport.perl: copying directory from original SVN place
22401 git-svnimport: support for partial imports
22403 Sean Estabrooks (1):
22404 Add --global option to git-repo-config.
22407 git-send-email: Document support for local sendmail instead of SMTP server
22408 git-send-email: Read the default SMTP server from the GIT config file
22410 Shawn O. Pearce (15):
22411 Use column indexes in git-cvsserver where necessary.
22412 Allow short pack names to git-pack-objects --unpacked=.
22413 Only repack active packs by skipping over kept packs.
22414 Teach git-index-pack how to keep a pack file.
22415 Remove unused variable in receive-pack.
22416 Move deny_non_fast_forwards handling completely into receive-pack.
22417 Teach receive-pack how to keep pack files based on object count.
22418 Added completion support for git-branch.exe.
22419 Added bash completion support for git-reset.
22420 Added missing completions for show-branch and merge-base.
22421 Only load .exe suffix'd completions on Cygwin.
22422 Bash completion support for remotes in .git/config.
22423 Take --git-dir into consideration during bash completion.
22424 Support bash completion on symmetric difference operator.
22425 Remove more sed invocations from within bash completion.
22428 Version v1.4.3.5; changes since v1.4.3.4:
22429 -----------------------------------------
22432 merge-recursive implicitely depends on trust_executable_bit
22435 git-svn: avoid printing filenames of files we're not tracking
22436 git-svn: don't die on rebuild when --upgrade is specified
22437 git-svn: fix dcommit losing changes when out-of-date from svn
22439 Jakub Narebski (1):
22440 Documentation: Transplanting branch with git-rebase --onto
22443 Fix git-runstatus for repositories containing a file named HEAD
22445 Junio C Hamano (3):
22446 adjust_shared_perm: chmod() only when needed.
22447 path-list: fix path-list-insert return value
22448 git-cvsserver: read from git with -z to get non-ASCII pathnames.
22451 Nicer error messages in case saving an object to db goes wrong
22453 Robert Shearman (1):
22454 git-rebase: Use --ignore-if-in-upstream option when executing git-format-patch.
22457 remove an unneeded test
22460 Version v1.4.3.4; changes since v1.4.3.3:
22461 -----------------------------------------
22464 Minor grammar fixes for git-diff-index.txt
22465 git-clone documentation didn't mention --origin as equivalent of -o
22467 Christian Couder (3):
22468 Remove --syslog in git-daemon inetd documentation examples.
22469 Documentation: add upload-archive service to git-daemon.
22470 Documentation: add git in /etc/services.
22473 Use memmove instead of memcpy for overlapping areas
22475 J. Bruce Fields (1):
22476 Documentation: updates to "Everyday GIT"
22478 Jakub Narebski (3):
22479 diff-format.txt: Combined diff format documentation supplement
22480 diff-format.txt: Correct information about pathnames quoting in patch format
22481 gitweb: Check git base URLs before generating URL from it
22484 Continue traversal when rev-list --unpacked finds a packed commit.
22486 Johannes Schindelin (1):
22487 link_temp_to_file: call adjust_shared_perm() only when we created the directory
22489 Junio C Hamano (9):
22490 Documentation: clarify refname disambiguation rules.
22491 combine-diff: a few more finishing touches.
22492 combine-diff: fix hunk_comment_line logic.
22493 combine-diff: honour --no-commit-id
22494 Surround "#define DEBUG 0" with "#ifndef DEBUG..#endif"
22495 quote.c: ensure the same quoting across platforms.
22496 revision traversal: --unpacked does not limit commit list anymore.
22497 link_temp_to_file: don't leave the path truncated on adjust_shared_perm failure
22498 apply: handle "traditional" creation/deletion diff correctly.
22501 pack-objects doesn't create random pack names
22504 git-cherry: document limit and add diagram
22506 Shawn O. Pearce (3):
22507 Use ULONG_MAX rather than implicit cast of -1.
22508 Remove SIMPLE_PROGRAMS and make git-daemon a normal program.
22509 Remove unsupported C99 style struct initializers in git-archive.
22512 Version v1.4.3.3; changes since v1.4.3.2:
22513 -----------------------------------------
22516 git-svn: fix symlink-to-file changes when using command-line svn 1.4.0
22519 Set $HOME for selftests
22521 Junio C Hamano (5):
22522 Documentation: note about contrib/.
22523 RPM package re-classification.
22524 Refer to git-rev-parse:Specifying Revisions from git.txt
22525 Update cherry documentation.
22526 Documentation/SubmittingPatches: 3+1 != 6
22529 xdiff: Match GNU diff behaviour when deciding hunk comment worthiness of lines
22532 git-fetch.sh printed protocol fix
22535 Version v1.4.3.2; changes since v1.4.3.1:
22536 -----------------------------------------
22538 Alexandre Julliard (1):
22539 prune-packed: Fix uninitialized variable.
22541 J. Bruce Fields (1):
22542 Make prune also run prune-packed
22544 Jakub Narebski (2):
22545 gitweb: Whitespace cleanup - tabs are for indent, spaces are for align (2)
22546 gitweb: Do not esc_html $basedir argument to git_print_tree_entry
22549 git-clone: honor --quiet
22550 xdiff/xemit.c (xdl_find_func): Elide trailing white space in a context header.
22552 Junio C Hamano (2):
22553 pager: default to LESS=FRSX not LESS=FRS
22554 daemon: do not die on older clients.
22556 Karl Hasselström (1):
22557 git-vc: better installation instructions
22560 Fix usagestring for git-branch
22563 gitweb: Fix setting $/ in parse_commit()
22566 git-merge: show usage if run without arguments
22569 Documentation for the [remote] config
22572 Version v1.4.3.1; changes since v1.4.3:
22573 ---------------------------------------
22575 Junio C Hamano (1):
22576 pager: default to LESS=FRS
22579 Fix typo in show-index.c
22581 Linus Torvalds (1):
22582 git-apply: prepare for upcoming GNU diff -u format change.
22584 Nguyễn Thái Ngọc Duy (2):
22585 Reject hexstring longer than 40-bytes in get_short_sha1()
22586 Add revspec documentation for ':path', ':[0-3]:path' and git-describe
22589 reduce delta head inflated size
22592 Version v1.4.3; changes since v1.4.3-rc3:
22593 -----------------------------------------
22595 Andy Whitcroft (1):
22596 add proper dependancies on the xdiff source
22598 Junio C Hamano (1):
22599 Revert "move pack creation to version 3"
22601 Linus Torvalds (1):
22602 Fix hash function in xdiff library
22605 git-imap-send: Strip smtp From_ header from imap message.
22608 svnimport: Fix broken tags being generated
22611 Make write_sha1_file_prepare() void
22612 Replace open-coded version of hash_sha1_file()
22615 Version v1.4.3-rc3; changes since v1.4.3-rc2:
22616 ---------------------------------------------
22618 Christian Couder (1):
22619 Fix tracing when GIT_TRACE is set to an empty string.
22622 git-svn: multi-init saves and reuses --tags and --branches arguments
22623 git-svn: log command fixes
22624 Documentation/git-svn: document some of the newer features
22625 git-svn: -h(elp) message formatting fixes
22626 commit: fix a segfault when displaying a commit with unreachable parents
22627 git-svn: add a message encouraging use of SVN::* libraries
22628 git-svn: fix commits over svn+ssh://
22629 git-svn: reduce memory usage for large commits
22631 Johannes Schindelin (3):
22632 diff: fix 2 whitespace issues
22633 cvsserver: Show correct letters for modified, removed and added files
22634 cvsserver: fix "cvs diff" in a subdirectory
22636 Junio C Hamano (6):
22637 Add WEBDAV timeout to http-fetch.
22638 git-fetch --update-head-ok typofix
22639 git-pull: we say commit X, not X commit.
22640 git.spec.in: perl subpackage is installed in perl_vendorlib not vendorarch
22641 apply --numstat -z: line termination fix.
22642 t4015: work-around here document problem on Cygwin.
22645 paginate git-diff by default
22648 atomic write for sideband remote messages
22651 Documentation: add missing second colons and remove a typo
22652 Add hash_sha1_file()
22653 Make write_sha1_file_prepare() static
22656 clone: the given repository dir should be relative to $PWD
22659 Version v1.4.3-rc2; changes since v1.4.3-rc1:
22660 ---------------------------------------------
22663 Update the gitweb/README file to include setting the GITWEB_CONFIG environment
22664 Fix usage string to match that given in the man page
22666 Alexandre Julliard (2):
22667 git.el: Fixed inverted "renamed from/to" message.
22668 vc-git.el: Switch to using git-blame instead of git-annotate.
22670 Dennis Stosberg (2):
22671 lock_ref_sha1_basic does not remove empty directories on BSD
22672 Add default values for --window and --depth to the docs
22674 Franck Bui-Huu (1):
22675 Add git-upload-archive to the main git man page
22677 Jakub Narebski (1):
22678 gitweb: Cleanup Git logo and Git logo target generation
22680 Junio C Hamano (9):
22681 Makefile: install and clean merge-recur, still.
22682 git-mv: invalidate the removed path properly in cache-tree
22683 git-push: .git/remotes/ file does not require SP after colon
22684 escape tilde in Documentation/git-rev-parse.txt
22685 tar-tree deprecation: we eat our own dog food.
22686 gitweb: Make the Git logo link target to point to the homepage
22687 git-send-email: avoid uninitialized variable warning.
22688 cherry-pick: make -r the default
22692 gitweb: Escape ESCAPE (\e) character
22693 gitweb: Do not print "log" and "shortlog" redundantly in commit view
22694 gitweb: blame: Minimize vertical table row padding
22697 gitweb: document webserver configuration for common gitweb/repo URLs.
22698 git-commit: cleanup unused function.
22699 git-commit: fix coding style.
22700 test-lib: separate individual test better in verbose mode.
22703 add commit count options to git-shortlog
22706 Show snapshot link in shortlog only if have_snapsho
22707 gitweb: Separate (new) and (deleted) in commitdiff by a space
22708 gitweb: Handle commits with empty commit messages more reasonably
22709 gitweb: [commit view] Do not suppress commitdiff link in root commit
22712 git-tar-tree: don't RUN_SETUP
22714 Robin Rosenberg (1):
22715 Error in test description of t1200-tutorial
22718 gitweb: refactor decode() for utf8 conversion
22721 Version v1.4.3-rc1; changes since v1.4.2.4:
22722 -------------------------------------------
22725 Use const for interpolate arguments
22726 fix daemon.c compilation for NO_IPV6=1
22727 do not discard constness in interp_set_entry value argument
22729 Andy Whitcroft (3):
22730 send-pack: remove remote reference limit
22731 send-pack: switch to using git-rev-list --stdin
22732 svnimport: add support for parsing From: lines for author
22734 Aneesh Kumar K.V (4):
22735 gitweb: Support for snapshot
22736 gitweb: fix snapshot support
22737 gitweb: Make blame and snapshot a feature.
22738 gitweb: Fix git_blame
22741 Patch for http-fetch.c and older curl releases
22743 Christian Couder (8):
22744 Trace into open fd and refactor tracing code.
22745 Trace into a file or an open fd and refactor tracing code.
22746 Update GIT_TRACE documentation.
22747 Fix memory leak in prepend_to_path (git.c).
22748 Move add_to_string to "quote.c" and make it extern.
22749 Fix a memory leak in "connect.c" and die if command too long.
22750 Fix space in string " false" problem in "trace.c".
22751 Remove empty ref directories that prevent creating a ref.
22753 David Rientjes (18):
22754 blame.c return cleanup
22755 builtin-grep.c cleanup
22756 builtin-push.c cleanup
22758 http-push.c cleanup
22759 read-cache.c cleanup
22760 Make pprint_tag void and cleans up call in cmd_cat_file.
22761 Make show_entry void
22762 Make checkout_all void.
22763 Make fsck_dir void.
22764 Make pack_objects void.
22765 Make track_tree_refs void.
22766 Make upload_pack void and remove conditional return.
22767 Make sha1flush void and remove conditional return.
22768 make inline is_null_sha1 global
22769 use appropriate typedefs
22770 remove unnecessary initializations
22771 Do not use memcmp(sha1_1, sha1_2, 20) with hardcoded length.
22773 Dennis Stosberg (10):
22774 "test" in Solaris' /bin/sh does not support -e
22775 Makefile fix for Solaris
22776 Add possibility to pass CFLAGS and LDFLAGS specific to the perl subdir
22777 Solaris has strlcpy() at least since version 8
22778 Look for sockaddr_storage in sys/socket.h
22779 Fix detection of ipv6 on Solaris
22780 Fix compilation with Sun CC
22781 gitweb: Use --git-dir parameter instead of setting $ENV{'GIT_DIR'}
22782 gitweb: Remove forgotten call to git_to_hash
22783 use do() instead of require() to include configuration
22785 Dmitry V. Levin (3):
22786 Make count-objects, describe and merge-tree work in subdirectory
22787 Documentation: Fix broken links
22788 Handle invalid argc gently
22791 pass DESTDIR to the generated perl/Makefile
22792 git-svn: establish new connections on commit after fork
22793 git-svn: recommend rebase for syncing against an SVN repo
22794 git-svn: add the 'dcommit' command
22795 git-svn: stop repeatedly reusing the first commit message with dcommit
22797 Franck Bui-Huu (10):
22798 Add a newline before appending "Signed-off-by: " line
22799 log-tree.c: cleanup a bit append_signoff()
22801 git-archive: wire up TAR format.
22802 git-archive: wire up ZIP format.
22803 Add git-upload-archive
22804 connect.c: finish_connect(): allow null pid parameter
22805 Test return value of finish_connect()
22806 upload-archive: monitor child communication even more carefully.
22807 git-archive: update documentation
22809 Haavard Skinnemoen (1):
22810 git-send-email: Don't set author_not_sender from Cc: lines
22812 Jakub Narebski (138):
22813 gitweb: whitespace cleanup
22814 gitweb: Use list for of open for running git commands, thorougly.
22815 gitweb: simplify git_get_hash_by_path
22816 gitweb: More explicit error messages for open "-|"
22817 gitweb: Cleanup - chomp $line in consistent style
22818 gitweb: Cleanup - chomp @lines in consistent style
22819 gitweb: Add git_page_nav for later use
22820 gitweb: Navbar refactoring - use git_page_nav to generate navigation bar
22821 gitweb: Replace form-feed character by ^L
22822 gitweb: Show project descriptions with utf-8 characters in project list correctly
22823 gitweb: Add "\n" after <br/> in git_page_nav
22824 gitweb: Pager refactoring - use git_get_paging_nav for pagination
22825 gitweb: Remove $project from git_get_paging_nav arguments
22826 gitweb: Headers refactoring - use git_header_div for header divs
22827 gitweb: Remove characters entities entirely when shortening string
22828 gitweb: Ref refactoring - use git_get_referencing for marking tagged/head commits
22829 gitweb: Refactor generation of shortlog, tags and heads body
22830 gitweb: do not quote path for list version of open "-|"
22831 gitweb: Remove characters entities entirely when shortening string -- correction
22832 gitweb: Reordering code and dividing it into categories
22833 gitweb: Refactoring git_project_list
22834 autoconf: Add support for setting SHELL_PATH and PERL_PATH
22835 autoconf: Move site configuration section earlier in configure.ac
22836 autoconf: Add support for setting PYTHON_PATH or NO_PYTHON
22837 autoconf: Check for ll hh j z t size specifiers introduced by C99
22838 autoconf: Typo cleanup, reordering etc.
22839 Copy description of new build configuration variables to configure.ac
22840 autoconf: Set NEEDS_LIBICONV unconditionally if there is no iconv in libc
22841 gitweb: Separate input validation and dispatch, add comment about opml action
22842 gitweb: die_error first (optional) parameter is HTTP status
22843 gitweb: Use undef for die_error to use default first (status) parameter value
22844 gitweb: Don't undefine query parameter related variables before die_error
22845 gitweb: Cleanup and uniquify error messages
22846 gitweb: No periods for error messages
22847 gitweb: No error messages with unescaped/unprotected user input
22848 gitweb: PATH_INFO=/ means no project
22849 gitweb: Inline $rss_link
22850 gitweb: Refactor untabifying - converting tabs to spaces
22851 gitweb: fix commitdiff for root commits
22852 gitweb: Skip nonmatching lines in difftree output, consistently
22853 autoconf: Unset NO_STH and NEED_STH when it is detected not needed
22854 gitweb: Remove unused variables in git_shortlog_body and git_heads
22855 autoconf: Add configure target to main Makefile
22856 autoconf: Error out on --without-shell and --without-perl
22857 autoconf: Improvements in NO_PYTHON/PYTHON_PATH handling
22858 autoconf: Move variables which we always set to config.mak.in
22859 autoconf: It is --without-python, not --no-python
22860 autoconf: Add support for setting CURLDIR, OPENSSLDIR, EXPATDIR
22861 gitweb: Whitespace cleanup - tabs are for indent, spaces are for align
22862 gitweb: Great subroutines renaming
22863 gitweb: Separate ref parsing in git_get_refs_list into parse_ref
22864 gitweb: Refactor printing shortened title in git_shortlog_body and git_tags_body
22865 gitweb: Separate main part of git_history into git_history_body
22866 gitweb: Separate finding project owner into git_get_project_owner
22867 gitweb: Change appereance of marker of refs pointing to given object
22868 gitweb: Skip comments in mime.types like file
22869 gitweb: True fix: Support for the standard mime.types map in gitweb
22870 gitweb: Separate printing difftree in git_commit into git_difftree_body
22871 gitweb: Show project's git URL on summary page
22872 gitweb: Add support for per project git URLs
22873 gitweb: Uniquify version info output, add meta generator in page header
22874 gitweb: Refactor printing commit message
22875 gitweb: Added parse_difftree_raw_line function for later use
22876 gitweb: Use parse_difftree_raw_line in git_difftree_body
22877 gitweb: bugfix: a.list formatting regression
22878 gitweb: Replace some presentational HTML by CSS
22879 gitweb: Whitespace cleanup: realign, reindent
22880 gitweb: Use underscore instead of hyphen to separate words in HTTP headers names
22881 gitweb: Route rest of action subroutines through %actions
22882 gitweb: Use here-doc
22883 gitweb: Drop the href() params which keys are not in %mapping
22884 gitweb: Sort CGI parameters returned by href()
22885 gitweb: Use git-diff-tree patch output for commitdiff
22886 gitweb: Show information about incomplete lines in commitdiff
22887 gitweb: Remove invalid comment in format_diff_line
22888 gitweb: Streamify patch output in git_commitdiff
22889 gitweb: Add git_get_{following,preceding}_references functions
22890 gitweb: Faster return from git_get_preceding_references if possible
22891 gitweb: Add git_get_rev_name_tags function
22892 gitweb: Use git_get_name_rev_tags for commitdiff_plain X-Git-Tag: header
22893 gitweb: Add support for hash_parent_base parameter for blobdiffs
22894 gitweb: Allow for pre-parsed difftree info in git_patchset_body
22895 gitweb: Parse two-line from-file/to-file diff header in git_patchset_body
22896 gitweb: Add invisible hyperlink to from-file/to-file diff header
22897 gitweb: Always display link to blobdiff_plain in git_blobdiff
22898 gitweb: Change here-doc back for style consistency in git_blobdiff
22899 gitweb: Use git-diff-tree or git-diff patch output for blobdiff
22900 gitweb: git_blobdiff_plain is git_blobdiff('plain')
22901 gitweb: Remove git_diff_print subroutine
22902 gitweb: Remove creating directory for temporary files
22903 gitweb: git_annotate didn't expect negative numeric timezone
22904 gitweb: Remove workaround for git-diff bug fixed in f82cd3c
22905 gitweb: Improve comments about gitweb features configuration
22906 gitweb: blobs defined by non-textual hash ids can be cached
22907 gitweb: Fix typo in git_difftree_body
22908 gitweb: Fix typo in git_patchset_body
22909 gitweb: Remove unused git_get_{preceding,following}_references
22910 gitweb: Remove git_to_hash function
22911 gitweb: Use @diff_opts, default ('M'), as git-diff and git-diff-tree paramete
22912 gitweb: Make git_print_log generic; git_print_simplified_log uses it
22913 gitweb: Do not remove signoff lines in git_print_simplified_log
22914 gitweb: Add author information to commitdiff view
22915 gitweb: git_print_log: signoff line is non-empty line
22916 gitweb: Add diff tree, with links to patches, to commitdiff view
22917 gitweb: Add local time and timezone to git_print_authorship
22918 gitweb: Move git-ls-tree output parsing to parse_ls_tree_line
22919 gitweb: Separate printing of git_tree row into git_print_tree_entry
22920 gitweb: Extend parse_difftree_raw_line to save commit info
22921 gitweb: Change the name of diff to parent link in "commit" view to "diff
22922 gitweb: Add GIT favicon, assuming image/png type
22923 gitweb: Correct typo: '==' instead of 'eq' in git_difftree_body
22924 gitweb: Divide page path into directories -- path's "breadcrumbs"
22925 autoconf: Add -liconv to LIBS when NEEDS_LIBICONV
22926 autoconf: Check for subprocess.py
22927 autoconf: Quote AC_CACHE_CHECK arguments
22928 autoconf: Fix copy'n'paste error
22929 autoconf: Set NO_ICONV if iconv is found neither in libc, nor in libiconv
22930 autoconf: Add support for setting NO_ICONV and ICONVDIR
22931 autoconf: Add config.cache to .gitignore
22932 gitweb: Make pickaxe search a feature
22933 gitweb: Paginate history output
22934 gitweb: Use File::Find::find in git_get_projects_list
22935 gitweb: Do not parse refs by hand, use git-peek-remote instead
22936 gitweb: Add git_project_index for generating index.aux
22937 gitweb: Allow for href() to be used for links without project param
22938 gitweb: Add link to "project_index" view to "project_list" page
22939 gitweb: Fix mimetype_guess_file for files with multiple extensions
22940 gitweb: Even more support for PATH_INFO based URLs
22941 gitweb: Require project for almost all actions
22942 gitweb: Always use git-peek-remote in git_get_references
22943 gitweb: Make git_get_refs_list do work of git_get_references
22944 gitweb: Fix thinko in git_tags and git_heads
22945 gitweb: Make git_get_hash_by_path check type if provided
22946 gitweb: Strip trailing slashes from $path in git_get_hash_by_path
22947 gitweb: Use "return" instead of "return undef" for some subs
22948 gitweb: Split validate_input into validate_pathname and validate_refname
22949 gitweb: Add git_url subroutine, and use it to quote full URLs
22950 gitweb: Quote filename in HTTP Content-Disposition: header
22953 gitweb: optionally read config from GITWEB_CONFIG
22954 diff: support custom callbacks for output
22955 Move color option parsing out of diff.c and into color.[ch]
22956 git-commit.sh: convert run_status to a C builtin
22957 git-status: document colorization config options
22958 contrib/vim: add syntax highlighting file for commits
22959 wt-status: remove extraneous newline from 'deleted:' output
22960 rev-list: fix segfault with --{author,committer,grep}
22961 git-repack: allow git-repack to run in subdirectory
22963 Johannes Schindelin (35):
22964 Git.xs: older perl do not know const char *
22965 Status update on merge-recursive in C
22966 Cumulative update of merge-recursive in C
22967 merge-recur: Convert variable names to lower_case
22968 merge-recur: Get rid of debug code
22969 merge-recur: Remove dead code
22970 merge-recur: Fix compiler warning with -pedantic
22971 merge-recur: Cleanup last mixedCase variables...
22972 merge-recur: Explain why sha_eq() and struct stage_data cannot go
22973 merge-recur: fix thinko in unique_path()
22974 read-trees: refactor the unpack_trees() part
22975 read-tree: move merge functions to the library
22976 merge-recur: use the unpack_trees() interface instead of exec()ing read-tree
22977 merge-recur: virtual commits shall never be parsed
22978 merge-recursive: fix rename handling
22979 http-push: avoid fork() by calling merge_bases() directly
22980 merge-recur: do not call git-write-tree
22981 merge-recur: do not setenv("GIT_INDEX_FILE")
22982 merge-recur: if there is no common ancestor, fake empty one
22983 merge-recur: try to merge older merge bases first
22984 merge-recur: do not die unnecessarily
22985 discard_cache(): discard index, even if no file was mmap()ed
22986 Add the --color-words option to the diff options family
22987 builtin-mv: readability patch
22988 unpack-objects: remove unused variable "eof"
22990 Remove uneeded #include
22991 fmt-merge-msg: fix off-by-one bug
22992 Teach runstatus about --untracked
22993 add receive.denyNonFastforwards config variable
22994 receive-pack: plug memory leak in fast-forward checking code.
22995 Document receive.denyNonFastforwards
22996 runstatus: do not recurse into subdirectories if not needed
22997 daemon: default to 256 for HOST_NAME_MAX if it is not defined
22998 diff --stat: ensure at least one '-' for deletions, and one '+' for additions
23001 Add virtualization support to git-daemon
23002 Cleaned up git-daemon virtual hosting support.
23003 Removed memory leaks from interpolation table uses.
23005 Jonas Fonseca (21):
23006 git-apply(1): document missing options and improve existing ones
23007 git-ls-remote(1): document --upload-pack
23008 git-blame(1): mention options in the synopsis and advertise pickaxe
23009 gitk(1): expand the manpage to look less like a template
23010 git(7): put the synopsis in a verse style paragraph
23011 gitview.txt: improve asciidoc markup
23012 git-svn(1): improve asciidoc markup
23013 describe: fix off-by-one error in --abbrev=40 handling
23014 Use PATH_MAX instead of MAXPATHLEN
23015 Use xrealloc instead of realloc
23016 Use fstat instead of fseek
23017 Use xcalloc instead of calloc
23018 Add --relative-date option to the revision interface
23019 git(7): move gitk(1) to the list of porcelain commands
23020 Use xmalloc instead of malloc
23021 Include config.mak.autogen in the doc Makefile
23022 git-rev-list(1): group options; reformat; document more options
23023 git-apply(1): document --unidiff-zero
23024 git-repack(1): document --window and --depth
23025 Fix trivial typos and inconsistencies in hooks documentation
23026 gitk(1): mention --all
23028 Junio C Hamano (125):
23029 Perl interface: add build-time configuration to allow building with -fPIC
23030 Perl interface: make testsuite work again.
23031 perl: fix make clean
23032 Git.pm: tentative fix to test the freshly built Git.pm
23033 Perly Git: arrange include path settings properly.
23034 Makefile: Set USE_PIC on x86-64
23035 Perly git: work around buggy make implementations.
23036 Git.pm: clean generated files.
23037 Perly Git: make sure we do test the freshly built one.
23038 INSTALL: a tip for running after building but without installing.
23039 Work around sed and make interactions on the backslash at the end of line.
23040 upload-pack: use object pointer not copy of sha1 to keep track of has/needs.
23041 upload-pack: lift MAX_NEEDS and MAX_HAS limitation
23042 recur vs recursive: help testing without touching too many stuff.
23043 sha1_file.c: expose map_sha1_file() interface.
23044 pack-objects: reuse deflated data from new-style loose objects.
23045 unpack-objects: read configuration data upon startup.
23046 Makefile: git-merge-recur depends on xdiff libraries.
23047 gitweb: There can be more than two levels of subdirectories
23048 gitweb: an obvious cut and paste error.
23049 gitweb: fix use of uninitialized value.
23050 gitweb: when showing history of a tree, show tree link not blob
23051 gitweb: avoid undefined value warning in print_page_path
23052 gitweb/README: do not bug Kay with gitweb questions anymore
23053 Makefile: gitweb/gitweb.cgi is now generated.
23054 gitweb: do not use @@FOO@@ for replaced tokens
23055 .gitignore: git-merge-recur is a built file.
23056 Make git-checkout-index a builtin
23057 builtins: Makefile clean-up
23058 git.c: Rename NEEDS_PREFIX to RUN_SETUP
23059 autoconf: fix NEEDS_SSL_WITH_CRYPTO
23061 Racy git: avoid having to be always too careful
23062 read-cache: tweak racy-git delay logic
23063 autoconf: clean temporary file mak.append
23064 git-grep: show pathnames relative to the current directory
23065 upload-pack: minor clean-up in multi-ack logic
23066 Fix type of combine-diff.c::show_patch_diff()
23067 Remove combine-diff.c::uninteresting()
23068 t4116 apply --reverse test
23069 git-apply --reverse: simplify reverse option.
23070 git-apply --binary: clean up and prepare for --reverse
23072 Documentation/technical/racy-git.txt
23073 Add check program "git-check-racy"
23074 Remove the "delay writing to avoid runtime penalty of racy-git avoidance"
23075 builtin-grep: remove unused debugging cruft.
23076 builtin-apply --reverse: two bugfixes.
23077 diff.c: make binary patch reversible.
23078 apply --reverse: tie it all together.
23080 git-apply --reject: send rejects to .rej files.
23081 git-apply --verbose
23082 apply --reject: count hunks starting from 1, not 0
23083 Convert memset(hash,0,20) to hashclr(hash).
23084 hashcpy/hashcmp remaining bits.
23085 builtin-grep.c: remove unused debugging piece.
23087 git-apply --reject: finishing touches.
23088 free(NULL) is perfectly valid.
23089 daemon: prepare for multiple services.
23090 daemon: add upload-tar service.
23091 multi-service daemon: documentation
23092 t5710: fix two thinkos.
23093 Constness tightening for move/link_temp_to_file()
23094 consolidate two copies of new style object header parsing code.
23095 pack-objects: re-validate data we copy from elsewhere.
23096 Revert "Convert git-annotate to use Git.pm"
23097 Revert "Git.pm: Introduce fast get_object() method"
23098 Revert "Make it possible to set up libgit directly (instead of from the environment)"
23099 pack-objects: fix thinko in revalidate code
23100 more lightweight revalidation while reusing deflated stream in packing
23101 unpack-objects desperately salvages objects from a corrupt pack
23102 revision.c: allow injecting revision parameters after setup_revisions().
23103 Teach rev-list an option to read revs from the standard input.
23104 Revert "daemon: add upload-tar service."
23105 Make apply --binary a no-op.
23106 diff --binary generates full index on binary files.
23107 Separate object listing routines out of rev-list
23108 pack-objects: run rev-list equivalent internally.
23109 pack-objects: further work on internal rev-list logic.
23110 pack-objects --unpacked=<existing pack> option.
23111 get_sha1_hex() micro-optimization
23112 archive: allow remote to have more formats than we understand.
23113 Move sideband client side support into reusable form.
23114 Move sideband server side support into reusable form.
23115 archive: force line buffered output to stderr
23116 Add --verbose to git-archive
23117 Teach --exec to git-archive --remote
23118 Prepare larger packet buffer for upload-pack protocol.
23119 Add sideband status report to git-archive protocol
23120 upload-archive: monitor child communication more carefully.
23121 builtin-archive.c: rename remote_request() to extract_remote_arg()
23122 pack-objects: document --revs, --unpacked and --all.
23123 http-fetch: fix alternates handling.
23124 unpack-objects -r: call it "recover".
23125 Document git-grep -[Hh]
23126 Define fallback PATH_MAX on systems that do not define one in <limits.h>
23127 Fix git-am safety checks
23128 http-fetch.c: consolidate code to detect missing fetch target
23129 Add ftp:// protocol support for git-http-fetch
23130 t1400: make test debuggable.
23131 apply --unidiff-zero: loosen sanity checks for --unidiff=0 patches
23132 builtin-grep: make pieces of it available as library.
23133 revision traversal: prepare for commit log match.
23134 revision traversal: --author, --committer, and --grep.
23135 repack: use only pack-objects, not rev-list.
23136 Update grep internal for grepping only in head/body
23137 git log: Unify header_filter and message_filter into one.
23138 Make hexval() available to others.
23139 sha1_name.c: understand "describe" output as a valid object name
23140 diff.c: second war on whitespace.
23141 git-apply: second war on whitespace.
23142 Add t5510 to test per branch configuration affecting git-fetch.
23143 Remove upload-tar and make git-tar-tree a thin wrapper to git-archive
23144 Deprecate merge-recursive.py
23145 diff --stat: allow custom diffstat output width.
23146 diff --stat: color output.
23147 An illustration of rev-list --parents --pretty=raw
23148 grep: free expressions and patterns when done.
23149 grep: fix --fixed-strings combined with expression.
23150 Contributed bash completion support for core Git tools.
23151 git-diff -B output fix.
23152 Remove -fPIC which was only needed for Git.xs
23155 Linus Torvalds (10):
23156 Relative timestamps in git log
23157 git-fsck-objects: lacking default references should not be fatal
23158 Fix git-fsck-objects SIGSEGV/divide-by-zero
23159 Add "-h/-H" parsing to "git grep"
23160 Allow multiple "git_path()" uses
23161 git-log --author and --committer are not left-anchored by default
23162 Clean up approxidate() in preparation for fixes
23163 Fix approxidate() to understand more extended numbers
23164 diff --stat=width[,name-width]: allow custom diffstat output width.
23165 Fix approxidate() to understand 12:34 AM/PM are 00:34 and 12:34
23168 Fix duplicate xmalloc in builtin-add
23171 gitweb: git_tree displays blame based on repository config
23172 gitweb: bugfix: git_commit and git_commitdiff parents
23173 gitweb: blame table row no highlight fix
23174 gitweb: bugfix: commitdiff regression
23175 gitweb: bugfix: git_print_page_path() needs the hash base
23176 gitweb: tree view: eliminate redundant "blob"
23177 gitweb: Remove redundant "tree" link
23178 gitweb: extend blame to show links to diff and previous
23179 Revert "gitweb: extend blame to show links to diff and previous"
23180 gitweb: Remove excessively redundant entries from git_difftree_body
23181 gitweb: Add history and blame to git_difftree_body()
23182 gitweb: "alternate" starts with shade (i.e. 1)
23183 gitweb: Remove redundant "commit" link from shortlog
23184 gitweb: Factor out gitweb_have_snapshot()
23185 gitweb: Add snapshot to shortlog
23186 gitweb: Don't use quotemeta on internally generated strings
23187 gitweb: Remove redundant "commit" from history
23188 gitweb: History: blob and tree are first, then commitdiff, etc
23189 gitweb: tree view: hash_base and hash are now context sensitive
23191 Martin Langhoff (1):
23192 git-repack: create new packs inside $GIT_DIR, not cwd
23195 gitweb: fill in gitweb configuration by Makefile
23196 gitweb: use out-of-line GIT logo.
23197 gitweb: provide function to format the URL for an action link.
23198 gitweb: consolidate action URL generation.
23199 gitweb: continue consolidation of URL generation.
23200 gitweb: support for "fp" parameter.
23201 gitweb: support for / as home_link.
23202 gitweb: fix project list if PATH_INFO=="/".
23203 gitweb: more support for PATH_INFO based URLs
23204 gitweb: fix uninitialized variable warning.
23205 gitweb: fix display of trees via PATH_INFO.
23207 Matthias Kestenholz (6):
23208 Make git-name-rev a builtin
23209 Make git-pack-objects a builtin
23210 Make git-unpack-objects a builtin
23211 Make git-symbolic-ref a builtin
23212 Add gitweb.cgi to .gitignore
23213 Check if pack directory exists prior to descending into it
23215 Matthias Lederhofer (12):
23216 pager: environment variable GIT_PAGER to override PAGER
23217 gitweb: use a hash to lookup the sub for an action
23218 gitweb: require $ENV{'GITWEB_CONFIG'}
23219 gitweb: check if HTTP_ACCEPT is really set
23220 gitweb: fix commitdiff_plain for root commits
23221 gitweb: fix $project usage
23222 gitweb: do not use 'No such directory' error message
23223 gitweb: export options
23224 gitweb: fix warnings in PATH_INFO code and add export_ok/strict_export
23225 gitweb fix validating pg (page) parameter
23226 format-patch: use cwd as default output directory
23227 git-format-patch: fix bug using -o in subdirectories
23230 move pack creation to version 3
23231 many cleanups to sha1_file.c
23233 Paul Mackerras (10):
23234 gitk: Minor cleanups
23235 gitk: Recompute ancestor/descendent heads/tags when rereading refs
23236 gitk: Add a row context-menu item for creating a new branch
23237 gitk: Add a context menu for heads
23238 gitk: Fix a couple of buglets in the branch head menu items
23239 gitk: Add a menu item for cherry-picking commits
23240 gitk: Update preceding/following tag info when creating a tag
23241 gitk: Improve responsiveness while reading and layout out the graph
23242 gitk: Fix some bugs in the new cherry-picking code
23243 diff-index --cc shows a 3-way diff between HEAD, index and working tree.
23246 Fix probing for already installed Error.pm
23247 Delete manuals if compiling without docs
23248 Make perl interface a separate package
23251 Introduce Git.pm (v4)
23252 Git.pm: Implement Git::exec_path()
23253 Git.pm: Call external commands using execv_git_cmd()
23254 Git.pm: Implement Git::version()
23255 Add Error.pm to the distribution
23256 Git.pm: Better error handling
23257 Git.pm: Handle failed commands' output
23258 Git.pm: Enhance the command_pipe() mechanism
23259 Git.pm: Implement options for the command interface
23260 Git.pm: Add support for subdirectories inside of working copies
23261 Convert git-mv to use Git.pm
23262 Git.pm: assorted build related fixes.
23263 Git.pm: Try to support ActiveState output pipe
23264 Git.pm: Swap hash_object() parameters
23265 Git.pm: Fix Git->repository("/somewhere/totally/elsewhere")
23266 Git.pm: Support for perl/ being built by a different compiler
23267 Git.pm: Remove PerlIO usage from Git.xs
23268 Git.pm: Avoid ppport.h
23269 Git.pm: Don't #define around die
23270 Use $GITPERLLIB instead of $RUNNING_GIT_TESTS and centralize @INC munging
23271 Git.pm: Add config() method
23272 Convert git-send-email to use Git.pm
23273 Git.pm: Introduce ident() and ident_person() methods
23274 Make it possible to set up libgit directly (instead of from the environment)
23275 Git.pm: Introduce fast get_object() method
23276 Convert git-annotate to use Git.pm
23277 Eliminate Scalar::Util usage from private-Error.pm
23278 Fix showing of path in tree view
23279 gitweb: Link (HEAD) tree for each project from projects list
23280 gitweb: More per-view navigation bar links
23281 gitweb: Link to tree instead of snapshot in shortlog
23282 gitweb: Link to latest tree from the head line in heads list
23283 gitweb: Link to associated tree from a particular log item in full log view
23284 gitweb: Rename "plain" labels to "raw"
23285 gitweb: Relabel "head" as "HEAD"
23286 Make path in tree view look nicer
23287 gitweb: Fix tree link associated with each commit log entry.
23288 gitweb: Fix @git_base_url_list usage
23289 Fix snapshot link in tree view
23290 Git.pm: Kill Git.xs for now
23291 Deprecate git-resolve.sh
23292 gitweb: Consolidate escaping/validation of query string
23293 gitweb: fix over-eager application of esc_html().
23295 Pierre Habouzit (7):
23296 Fix a comparison bug in diff-delta.c
23297 avoid to use error that shadows the function name, use err instead.
23298 git_dir holds pointers to local strings, hence MUST be const.
23299 missing 'static' keywords
23300 remove ugly shadowing of loop indexes in subloops.
23301 use name[len] in switch directly, instead of creating a shadowed variable.
23302 n is in fact unused, and is later shadowed.
23304 Randal L. Schwartz (1):
23305 builtin-upload-archive.c broken on openbsd
23308 git-verify-pack: make builtin
23310 Add write_or_die(), a helper function
23312 git-cherry: remove unused variable
23313 git-reset: remove unused variable
23314 Add git-zip-tree to .gitignore
23315 git-archive: make compression level of ZIP archives configurable
23316 Use xstrdup instead of strdup in builtin-{tar,zip}-tree.c
23317 git-archive: inline default_parse_extra()
23318 git-tar-tree: devolve git-tar-tree into a wrapper for git-archive
23319 Remove git-zip-tree
23320 Rename builtin-zip-tree.c to archive-zip.c
23321 git-tar-tree: Remove duplicate git_config() call
23322 git-tar-tree: Move code for git-archive --format=tar to archive-tar.c
23324 Robin Rosenberg (2):
23325 Quote arguments to tr in test-lib
23326 Make cvsexportcommit remove files.
23329 Fetch: default remote repository from branch properties
23330 fetch: get the remote branches to merge from the branch properties
23331 Add test for the default merges in fetch.
23332 fetch: Reset remote refs list each time fetch_main is called
23334 Sasha Khapyorsky (3):
23335 Trivial support for cloning and fetching via ftp://.
23336 git-svnimport: Parse log message for Signed-off-by: lines
23337 http/ftp: optionally ask curl to not use EPSV command
23340 Documentation: Fix howto/revert-branch-rebase.html generation
23341 git-svn: Fix fetch --no-ignore-externals with GIT_SVN_NO_LIB=1
23343 Shawn O. Pearce (15):
23344 Verify we know how to read a pack before trying to using it.
23345 Remove unnecessary forward declaration of unpack_entry.
23346 Convert memcpy(a,b,20) to hashcpy(a,b).
23347 Convert memcpy(a,b,20) to hashcpy(a,b).
23348 Reorganize/rename unpack_non_delta_entry to unpack_compressed_entry.
23349 Reuse compression code in unpack_compressed_entry.
23350 Cleanup unpack_entry_gently and friends to use type_name array.
23351 Cleanup unpack_object_header to use only offsets.
23352 Convert unpack_entry_gently and friends to use offsets.
23353 Replace uses of strdup with xstrdup.
23354 Allow 'svn fetch' on '(no date)' revisions in Subversion.
23355 Allow '(no author)' in git-svn's authors file.
23356 Ignore executable bit when adding files if filemode=0.
23357 Allow git-checkout when on a non-existant branch.
23358 Corrected copy-and-paste thinko in ignore executable bit test case.
23360 Tilman Sauerbeck (2):
23362 Added support for dropping privileges to git-daemon.
23365 --name-only, --name-status, --check and -s are mutually exclusive
23366 Remove awkward compatibility warts
23369 Be nicer if git executable is not installed
23372 gitweb: configurable home link string
23373 gitweb: Decode long title for link tooltips
23376 Version v1.4.2.4; changes since v1.4.2.3:
23377 -----------------------------------------
23379 Linus Torvalds (1):
23380 Fix hash function in xdiff library
23383 Version v1.4.2.3; changes since v1.4.2.2:
23384 -----------------------------------------
23386 Junio C Hamano (2):
23387 git-mv: invalidate the removed path properly in cache-tree
23388 git-push: .git/remotes/ file does not require SP after colon
23391 Version v1.4.2.2; changes since v1.4.2.1:
23392 -----------------------------------------
23394 Junio C Hamano (2):
23395 Fix git-am safety checks
23396 git-diff -B output fix.
23399 Fix duplicate xmalloc in builtin-add
23402 Version v1.4.2.1; changes since v1.4.2:
23403 ---------------------------------------
23405 Dennis Stosberg (1):
23406 Solaris does not support C99 format strings before version 10
23408 Johannes Schindelin (5):
23409 git-mv: succeed even if source is a prefix of destination
23410 git-mv: add more path normalization
23411 git-mv: special case destination "."
23412 git-mv: fix off-by-one error
23413 builtin-mv: readability patch
23415 Junio C Hamano (2):
23416 finish_connect(): thinkofix
23417 http-fetch: fix alternates handling.
23420 Fix regex pattern in commit-msg
23421 sample commit-msg hook: no silent exit on duplicate Signed-off-by lines
23424 Version v1.4.2; changes since v1.4.2-rc4:
23425 -----------------------------------------
23428 git-svn: correctly kill keyword expansion without munging EOLs
23429 git-svn: bugfix: allow SVN:: lib users to track the root of the repository
23430 git-svn: split the path from the url correctly with limited perms
23432 Junio C Hamano (8):
23433 git-apply: applying a patch to make a symlink shorter.
23434 combine-diff: use color
23436 builtin-apply: remove unused increment
23437 git-sh-setup: do not use repo-config to test the git directory
23438 git-am: give better diagnostics when the patch does not apply during --3way
23439 Better error message when we are unable to lock the index file
23440 t/t4013: fix futzing with the version string.
23442 Matthias Lederhofer (1):
23443 upload-pack: fix timeout in create_pack_file
23445 Paul Mackerras (2):
23446 gitk: Allow the user to set some colors
23447 gitk: Show the currently checked-out head in bold font
23449 Ramsay Allan Jones (1):
23450 Fix header breakage with _XOPEN_SOURCE.
23453 Add has_extension()
23454 git-verify-pack: show usage when no pack was specified
23455 git-verify-pack: more careful path handling
23456 git-verify-pack: insist on .idx extension
23457 git-verify-pack: get rid of while loop
23458 git-verify-pack: free pack after use and a cleanup
23459 git-verify-pack: buffer overrun paranoia
23460 git-verify-pack: no need to count errors
23461 drop length argument of has_extension
23463 Rutger Nijlunsing (2):
23464 http-push: Make WebDAV work with (broken?) default apache2 WebDAV module
23465 Add Documentation/howto/setup-git-server-over-http.txt
23468 Version v1.4.2-rc4; changes since v1.4.2-rc3:
23469 ---------------------------------------------
23472 git-push: allow pushing from subdirectories
23474 Johannes Schindelin (1):
23475 Fix crash when GIT_DIR is invalid
23478 Update git-init-db(1) and documentation of core.sharedRepository
23480 Junio C Hamano (13):
23481 Cygwin needs NO_C99_FORMAT???
23482 Further clean-up: usage() vs die()
23483 Makefile: Cygwin does not seem to need NO_STRLCPY
23485 debugging: XMALLOC_POISON
23486 builtin-mv: fix use of uninitialized memory.
23487 GIT-VERSION-GEN: adjust for ancient git
23488 Documentation: git-status takes the same options as git-commit
23489 Fix tutorial-2.html
23490 check return value from diff_setup_done()
23491 find_unique_abbrev() with len=0 should not abbreviate
23492 make --find-copies-harder imply -C
23493 allow diff.renamelimit to be set regardless of -M/-C
23495 Michael Krelin (1):
23496 handle https:// protocol in git-clone
23498 Ramsay Allan Jones (4):
23499 Fixup command names in some usage strings.
23500 Replace some calls to die(usage_str) with usage(usage_str).
23501 Allow config file to specify Signed-off-by identity in format-patch.
23502 commit walkers: setup_ident() to record correct committer in ref-log.
23505 git-tar-tree: fix minor memory leak
23508 log-tree: show_log() should respect the setting of diffopt->line_termination
23509 annotate: Fix bug when parsing merges with differing real and logical parents.
23511 Uwe Kleine-König (1):
23512 Document rev-list's option --merge
23515 Version v1.4.2-rc3; changes since v1.4.2-rc2:
23516 ---------------------------------------------
23519 Build on Debian GNU/kFreeBSD
23521 Jakub Narebski (11):
23522 Allow INSTALL, bindir, mandir to be set in main Makefile
23523 Rename man1 and man7 variables to man1dir and man7dir
23524 autoconf: Use autoconf to write installation directories to config.mak.autogen
23525 Teach make clean about configure and autoconf
23526 Copy description of build configuration variables to configure.ac
23527 autoconf: Preparing the way for autodetection
23528 autoconf: Checks for typedefs, structures, and compiler characteristics.
23529 autoconf: Checks for some library functions.
23530 autoconf: Checks for libraries
23531 autoconf: Checks for some programs
23532 configure.ac vertical whitespace usage cleanup
23535 git-push: allow -f as an alias for --force
23536 git-push: remove obsolete git-push.sh
23537 Documentation: convert uses of git-link macro to gitlink
23538 git-annotate: remove extraneous debugging line
23540 Johannes Schindelin (16):
23541 Allow an alias to start with "-p"
23542 git wrapper: add --git-dir=<path> and --bare options
23543 git-instaweb: some Apache have mod_cgi builtin
23544 git-instaweb: respect bindir from Makefile
23545 gitweb: fix two warnings
23546 t7001: add test for git-mv dir1 dir2/
23547 git-cvsserver: support multiline commit messages
23548 Extract helper bits from c-merge-recursive work
23549 Make git-mv a builtin
23550 builtin git-mv: support moving directories
23551 instaweb: Be more clear if httpd or the browser fail
23552 cvsserver: imitate git-update-ref when committing
23553 Makefile: ssh-pull.o depends on ssh-fetch.c
23554 Teach git-apply about '-R'
23556 tar-tree: illustrate an obscure feature better
23558 Josef Weidendorfer (1):
23559 Extend testing git-mv for renaming of subdirectories
23561 Junio C Hamano (18):
23562 git-diff A...B to (usually) mean "git-diff `git-merge-base A B` B"
23563 t4112: simplify the test and remove unneeded working tree file.
23564 lost-found: use fsck-objects --full
23565 git-reset: detect update-ref error and report it.
23566 log and diff family: honor config even from subdirectories
23567 git-apply -R: binary patches are irreversible for now.
23568 t4103: fix binary patch application test.
23569 git-checkout: allow "checkout HEAD -- path"
23570 Builtins: control the use of pager from the command table.
23571 fetch/clone: mark messages from remote side stand out.
23572 Fix "git diff blob1 blob2" showing the diff in reverse.
23573 read-tree: shadowed variable fix.
23574 Add a couple of subdirectory tests.
23575 diff.c: do not use pathname comparison to tell renames
23576 Show both blob names from "git diff blob1 blob2"
23577 sideband: do not use color, just say "remote:"
23578 Documentation/git.txt: link git-svn and git-instaweb from the main page.
23581 Linus Torvalds (4):
23582 Call setup_git_directory() early
23583 Call setup_git_directory() much earlier
23584 Fix double "close()" in ce_compare_data
23585 Fix up some fallout from "setup_git_directory()" cleanups
23588 gitweb.cgi: Teach git_history() to read hash from $hash_base
23589 gitweb.cgi: Include direct link to "raw" files from "history"
23590 gitweb.cgi: git_blame2: an alternative simple working git blame
23591 gitweb.cgi: git_blame2: Allow back-trekking through commits
23592 gitweb.cgi: Show "raw" head of project link even when $hash is not defined
23593 gitweb.cgi: git_blame2: Revision blocks now have alternating colors
23594 gitweb.cgi: Centralize printing of the page path
23595 gitweb.cgi: git_blame2: slight optimization reading the blame lines
23597 Matthias Kestenholz (3):
23598 Make git-prune-packed a builtin
23599 Make git-repo-config a builtin
23600 use declarations from builtin.h for builtin commands
23602 Matthias Lederhofer (5):
23603 daemon: documentation for --reuseaddr, --detach and --pid-file
23604 setup_git_directory_gently: do not barf when GIT_DIR is given.
23605 git.c: allow alias expansion without a git directory
23606 pager: config variable pager.color
23607 git-grep: document --and, --or, --not, ( and )
23609 Michael S. Tsirkin (1):
23610 mailinfo: accept >From in message header
23612 Michele Ballabio (1):
23613 fixed variable declaration in gitk
23616 Typofix in configure.ac comment.
23617 Quote all calls to GIT_CONF_APPEND_LINE
23618 Set datarootdir in config.mak.in
23621 Remove -d from *-fetch usage strings
23622 Make pull() take some implicit data as explicit arguments
23623 Make pull() support fetching multiple targets at once
23624 Teach git-local-fetch the --stdin switch
23625 Teach git-http-fetch the --stdin switch
23627 Ramsay Allan Jones (7):
23628 Ensure git-clone exits with error if perl script fails.
23629 Fix annotate test script; notice when git-annotate fails.
23630 Fix installation of templates on ancient systems.
23631 New tests and en-passant modifications to mktag.
23632 Add NO_C99_FORMAT to support older compilers.
23633 Fix header breakage due to redefining PATH_MAX.
23634 Remove cmd_usage() routine and re-organize the help/usage code.
23636 Robert Shearman (2):
23637 rebase: Fix the detection of fast-forwarding of the current branch to upstream.
23638 rebase: Make the fast-fowarding message more user-friendly by using branch names instead of SHA1 IDs.
23640 Shawn O. Pearce (1):
23641 Display an error from update-ref if target ref name is invalid.
23644 Version v1.4.2-rc2; changes since v1.4.2-rc1:
23645 ---------------------------------------------
23648 Trivial path optimization test
23650 Alexandre Julliard (5):
23651 git.el: Run git-rerere on commits if the rr-cache directory exists.
23652 git.el: Prepend a slash to the file name when adding to .gitignore.
23653 git.el: Try to reuse an existing buffer when running git-status.
23654 git.el: Put the git customize group in the 'tools' parent group.
23655 show-branch: Fix another performance problem.
23658 gitweb: escape tag comments
23661 typechange tests for git apply (currently failing)
23662 git-svn: fix fetching new directories copies when using SVN:: libs
23665 pack-objects: check pack.window for default window size
23666 Colorize 'commit' lines in log ui
23668 Johannes Schindelin (4):
23669 Fix t4114 on cygwin
23670 Always reset the color _before_ printing out the newline
23671 cvsserver: suppress warnings
23672 cvsserver: avoid warning about active db handles
23675 git-format-patch: Make the second and subsequent mails replies to the first
23676 Add option to enable threading headers
23677 Add option to set initial In-Reply-To/References
23679 Junio C Hamano (8):
23680 fetch/clone: check return status from ls-remote
23681 builtin-log: typefix for recent format-patch changes.
23682 checkout -f failed to check out a file if an existing directory interfered.
23683 apply: check D/F conflicts more carefully.
23684 apply: split out removal and creation into different phases.
23685 apply: handle type-changing patch correctly.
23686 git-fetch: fix --keep vs --thin
23687 unpack-objects: remove stale and confusing comment
23689 Linus Torvalds (1):
23690 sha1_file: add the ability to parse objects in "pack file format"
23692 Lukas Sandström (1):
23693 git-am: Don't accept an mbox on stdin of we already have a .dotest directory
23695 Martin Langhoff (1):
23696 cvsexportcommit - add -a (add author line) flag, cleanup warnings
23698 Matthias Lederhofer (1):
23699 upload-pack: fix timeout in create_pack_file
23702 Substitute xmalloc()+memset(0) with xcalloc().
23705 Defaulting fetch to origin when set in the repo-config
23707 Shawn O. Pearce (1):
23708 Disable linking with Fink or DarwinPorts.
23711 tar-tree: add the "tar.umask" config option
23714 Version v1.4.2-rc1; changes since v1.4.1.1:
23715 -------------------------------------------
23717 A Large Angry SCM (1):
23718 Additional merge-base tests (revised)
23721 Do not use perl in git-commit.sh
23724 Fix some doubled word typos
23725 Fix some doubled word typos
23726 Fix typos involving the word 'commit'
23727 typofix (git-name-rev documentation)
23728 git-send-email: Remove redundant Reply-To header
23729 gitweb: Send XHTML as 'application/xhtml+xml' where possible
23730 gitweb: Include a site name in page titles
23731 gitweb: Make command invocations go through the git wrapper
23732 documentation (urls.txt) typofix
23734 Dennis Stosberg (2):
23735 gitweb: Declare global variables with "our"
23736 gitweb: Declare global variables with "our"
23739 Add git-instaweb, instantly browse the working repo with gitweb
23740 instaweb: fix unportable ';' usage in sed
23741 t8001-annotate: fix a bash-ism in this test
23742 git-svn: avoid fetching files outside of the URL we're tracking
23743 git-svn: migrate out of contrib
23744 builtin-log: respect diff configuration options
23745 diff.c: respect diff.renames config option
23746 templates/hooks--update: replace diffstat calls with git diff --stat
23747 git-svn: fix --file/-F option in commit-diff
23748 tests: Set EDITOR=: and VISUAL=: globally
23749 git-fetch: fix a bashism (==)
23750 git-svn: don't check for migrations/upgrades on commit-diff
23752 Jakub Narebski (3):
23753 send-email: format 2822 datestring ourselves.
23754 Wrap long lines in docstrings in contrib/emacs/git.el
23755 Display help for Git mode after pressing `h' or `?' in *git-status*
23757 Joachim Berdal Haga (2):
23758 Make zlib compression level configurable, and change default.
23759 core.compression documentation formatting fix.
23761 Johannes Schindelin (7):
23762 refactor merge_bases() as preparation to libify merge-base
23763 move get_merge_bases() to core lib.
23764 Makefile: replace ugly and unportable sed invocation
23765 Make git-fmt-merge-msg a builtin
23766 Makefile: export NO_SVN_TESTS
23767 Close the index file between writing and committing
23768 Fix linking for not-so-clever linkers.
23771 Documentation/urls.txt: Use substitution to escape square brackets
23773 Junio C Hamano (49):
23774 Makefile: add framework to verify and bench sha1 implementations.
23775 test-sha1: test hashing large buffer
23776 t4013: add tests for diff/log family output options.
23777 t4013: add more tests around -c and --cc
23778 Fix some more diff options changes.
23779 t4013 test updates for new output code.
23780 combine-diff.c: type sanity.
23781 format-patch: fix diff format option implementation
23782 t4013: add format-patch tests.
23783 t4013: note improvements brought by the new output code.
23784 gitweb: optimize per-file history generation
23785 gitweb: optimize per-file history generation
23786 t4013: add "diff" UI program tests.
23787 builtin-diff: turn recursive on when defaulting to --patch format.
23788 commit.c: do not redefine UNINTERESTING bit.
23789 get_merge_bases: clean up even when there is no common commit.
23790 revert clear-commit-marks for now.
23791 boolean: accept yes and no as well
23792 send-email: do not barf when Term::ReadLine does not like your terminal
23793 t6200: fmt-merge-msg test.
23794 git-grep: fix parsing of pathspec separator '--'
23795 git-grep: fix exit code when we use external grep.
23796 git-grep: use a bit more specific error messages.
23797 Re-fix clear_commit_marks().
23798 git-grep: boolean expression on pattern matching.
23799 git-reset: complain and exit upon seeing an unknown parameter.
23800 mailinfo: assume input is latin-1 on the header as we do for the body
23801 diffcore-rename: try matching up renames without populating filespec first.
23802 builtin-rev-parse.c: constness tightening
23803 show-branch: match documentation and usage
23804 rev-parse documentation: talk about range notation.
23805 git-svn: migrate out of contrib (follow-up)
23806 diff.c: --no-color to defeat diff.color configuration.
23807 Update diff-options and config documentation.
23808 git log -p --merge [[--] paths...]
23809 colored diff: diff.color = auto fix
23810 diff: do not use configuration magic at the core-level
23811 "git -p cmd" to page anywhere
23812 merge-base: update the clean-up postprocessing
23814 Fix grammatical error in git-revert
23815 git-repack: avoid redirecting stderr into git-pack-objects
23816 test-lib: unset GIT_TRACE
23817 t4013 diff format tests update
23818 Adjust t4013 tests to corrected format-patch.
23819 Documentation: Fix ssh://[user@]host.xz URL
23820 builtin-prune.c: forgot TYPE => OBJ changes.
23821 Documentation/Makefile: product depends on asciidoc.conf
23822 show-branch: fix performance problem.
23824 Linus Torvalds (7):
23825 xdiff: generate "anti-diffs" aka what is common to two files
23826 Prepare "git-merge-tree" for future work
23827 Improved three-way blob merging code
23828 Improve git-peek-remote
23829 builtin "git prune"
23830 Make the unpacked object header functions static to sha1_file.c
23831 Remove TYPE_* constant macros and use object_type enums consistently.
23834 gitweb: Enable tree (directory) history display
23835 gitweb: Enable tree (directory) history display
23836 Add "raw" output option to blobs in "tree" view format
23837 gitweb.cgi: Create $git_temp if it doesn't exist
23838 gitweb.cgi: Teach "a=blob" action to know the blob/file mime type
23839 gitweb.css: Use monospace fonts for commits and tree-diff.
23841 Matthias Lederhofer (10):
23842 GIT_TRACE: show which built-in/external commands are executed
23843 change ent to tree in git-diff documentation
23844 git-rev-list: add documentation for --parents, --no-merges
23845 daemon: use a custom die routine with syslog
23846 daemon: if one of the standard fds is missing open it to /dev/null
23847 upload-pack: ignore write errors to stderr
23848 daemon: new option --pid-file=<path> to store the pid
23849 daemon: new option --detach to run git-daemon in background
23850 Documentation about exclude/ignore files
23851 argv created by handle_alias should be NULL terminated
23854 sed -e '/RE/r rfile/' needs space in 'r rfile'
23855 Using 'perl' in *.sh
23858 Assorted typo fixes
23859 Typofix in Makefile comment.
23860 Fix more typos, primarily in the code
23861 Avoid C99 comments, use old-style C comments instead.
23864 git-cvsexportcommit can't handle merge commits correctly
23867 Add get_merge_bases_clean()
23868 Add '...' operator for revisions
23869 Make clear_commit_marks() clean harder
23870 Fold get_merge_bases_clean() into get_merge_bases()
23871 rev-list: free commit_list in ... handler
23873 Robert Shearman (1):
23874 format-patch: Generate a newline between the subject header and the message body
23877 annotate: Support annotation of files on other revisions.
23878 annotate: Correct most merge following to annotate correctly.
23879 Disable color detection during format-patch
23882 Teach rev-parse the ... syntax.
23885 Fix "git-fetch --tags" exit status when nothing has been changed
23887 Shawn O. Pearce (9):
23888 Avoid C99 initializers
23889 Allow user.name and user.email to drive reflog entry.
23890 Record the type of commit operation in the reflog.
23891 Log ref changes made by git-fetch and git-pull.
23892 Log ref changes made by git-merge and git-pull.
23893 Log ref changes made by quiltimport.
23894 Log ref changes made by resolve.
23895 Make lazy mkdir more robust.
23896 Record rebase changes as 'rebase' in the reflog.
23899 Do not drop data from '\0' until eol in patch output
23900 Teach --text option to diff
23901 Teach diff -a as shorthand for --text
23902 Add -a and --text to common diff options help
23903 diff-options: Explain --text and -a
23905 Timo Hirvonen (14):
23906 Merge with_raw, with_stat and summary variables to output_format
23907 Make --raw option available for all diff commands
23908 Set default diff output format after parsing command line
23909 DIFF_FORMAT_RAW is not default anymore
23910 Add msg_sep to diff_options
23911 Don't xcalloc() struct diffstat_t
23912 whatchanged: Default to DIFF_FORMAT_RAW
23913 Print empty line between raw, stat, summary and patch
23914 diff-tree: Use ---\n as a message separator
23915 log --raw: Don't descend into subdirectories by default
23917 GIT_TRACE: fix a mixed declarations and code warning
23918 diff: Support both attributes and colors
23919 diff: Support 256 colors
23922 Fix print-log and diff compatibility with recent vc versions
23925 Mention the [user@] part in documentation of ssh:// urls.
23928 A better-scheduled PPC SHA-1 implementation.
23931 Version v1.4.1.1; changes since v1.4.1:
23932 ---------------------------------------
23934 Junio C Hamano (1):
23935 Makefile: tighten git-http-{fetch,push} dependencies
23937 Linus Torvalds (1):
23938 revision.c: fix "dense" under --remove-empty
23940 Matthias Lederhofer (1):
23941 upload-pack: fix timeout in create_pack_file
23943 Robin Rosenberg (1):
23944 Empty author may be presented by svn as an empty string or a null value.
23947 Version v1.4.1; changes since v1.4.1-rc2:
23948 -----------------------------------------
23951 git-svn: allow a local target directory to be specified for init
23953 Johannes Schindelin (4):
23954 add diff_flush_patch_id() to calculate the patch id
23955 format-patch: introduce "--ignore-if-in-upstream"
23956 t4014: fix for whitespace from "wc -l"
23957 format-patch: use clear_commit_marks() instead of some ad-hockery
23959 Junio C Hamano (6):
23960 git-repack: Be careful when updating the same pack as an existing one.
23961 t4014: add format-patch --ignore-if-in-upstream test
23962 t4014: fix test commit labels.
23963 diff.c: fix get_patch_id()
23965 upload-pack.c: <sys/poll.h> includes <ctype.h> on OpenBSD 3.8
23967 Linus Torvalds (4):
23968 Do not try futile object pairs when repacking.
23969 Abstract out accesses to object hash array
23970 revision.c: --full-history fix.
23971 git object hash cleanups
23974 consider previous pack undeltified object state only when reusing delta data
23975 don't load objects needlessly when repacking
23978 Fix errno usage in connect.c
23980 Robin Rosenberg (1):
23981 Minor documentation fixup.
23984 Version v1.4.1-rc2; changes since v1.4.1-rc1:
23985 ---------------------------------------------
23987 Andreas Ericsson (1):
23988 git wrapper: fix command name in an error message.
23990 Dennis Stosberg (3):
23991 Solaris needs inclusion of signal.h for signal()
23992 Fix pkt-line.h to compile with a non-GCC compiler
23993 Fix expr usage for FreeBSD
23996 rebase: allow --merge option to handle patches merged upstream
23997 rebase: cleanup rebasing with --merge
23998 rebase: allow --skip to work with --merge
23999 git-svn: SVN 1.1.x library compatibility
24000 git-svn: several graft-branches improvements
24001 git-svn: add the commit-diff command
24002 git-svn: add --follow-parent and --no-metadata options to fetch
24003 git-svn: be verbose by default on fetch/commit, add -q/--quiet option
24004 rebase: get rid of outdated MRESOLVEMSG
24005 rebase: check for errors from git-commit
24008 git-commit: allow -e option anywhere on command line
24009 quote.c: silence compiler warnings from EMIT macro
24011 Johannes Schindelin (5):
24012 patch-id: take "commit" prefix as well as "diff-tree" prefix
24013 Teach diff about -b and -w flags
24014 cvsimport: always set $ENV{GIT_INDEX_FILE} to $index{$branch}
24015 apply: replace NO_ACCURATE_DIFF with --inaccurate-eof runtime flag.
24016 Save errno in handle_alias()
24018 Junio C Hamano (12):
24019 Makefile: do not recompile main programs when libraries have changed.
24020 usage: minimum type fix.
24021 git-pull: abort when fmt-merge-msg fails.
24023 diff --color: use reset sequence when we mean reset.
24024 repo-config: fix printing of bool
24025 diff --color: use $GIT_DIR/config
24026 combine-diff.c: type sanity
24027 connect.c: remove unused parameters from tcp_connect and proxy_connect
24028 connect.c: check the commit buffer boundary while parsing.
24029 t/README: start testing porcelainish
24030 checkout -m: fix read-tree invocation
24032 Linus Torvalds (1):
24035 Martin Langhoff (3):
24036 git-repack -- respect -q and be quiet
24037 cvsimport: setup indexes correctly for ancestors and incremental imports
24038 cvsimport - cleanup of the multi-indexes handling
24040 Matthias Kestenholz (1):
24041 add GIT-CFLAGS to .gitignore
24043 Matthias Lederhofer (1):
24044 correct documentation for git grep
24047 Rename safe_strncpy() to strlcpy().
24050 Customizable error handlers
24053 git-merge: Don't use -p when outputting summary
24055 Make some strings const
24058 git-commit: filter out log message lines only when editor was run.
24061 Version v1.4.1-rc1; changes since v1.4.0:
24062 -----------------------------------------
24065 object-refs: avoid division by zero
24067 David Woodhouse (1):
24068 Log peer address when git-daemon called from inetd
24070 Dennis Stosberg (3):
24071 Make t4101-apply-nonl bring along its patches
24072 Make t8001-annotate and t8002-blame more portable
24073 Fix t8001-annotate and t8002-blame for ActiveState Perl
24075 Eric W. Biederman (3):
24076 Don't parse any headers in the real body of an email message.
24077 Fix git-format-patch -s
24078 Check and document the options to prevent mistakes.
24081 git-svn: t0000: add -f flag to checkout
24082 git-svn: fix handling of filenames with embedded '@'
24083 git-svn: eol_cp corner-case fixes
24084 git-svn: restore original LC_ALL setting (or unset) for commit
24085 git-svn: don't allow commit if svn tree is not current
24086 git-svn: support -C<num> passing to git-diff-tree
24087 git-svn: --branch-all-refs / -B support
24088 git-svn: optimize --branch and --branch-all-ref
24089 git-svn: support manually placed initial trees from fetch
24090 git-svn: Move all git-svn-related paths into $GIT_DIR/svn
24091 git-svn: minor cleanups, extra error-checking
24092 git-svn: add --repack and --repack-flags= options
24093 git-svn: add --shared and --template= options to pass to init-db
24094 git-svn: add some functionality to better support branches in svn
24095 git-svn: add UTF-8 message test
24096 git-svn: add 'log' command, a facsimile of basic `svn log'
24097 git-svn: add support for Perl SVN::* libraries
24098 git-svn: make the $GIT_DIR/svn/*/revs directory obsolete
24099 git-svn: avoid creating some small files
24100 git-svn: fix several small bugs, enable branch optimization
24101 git-svn: Eliminate temp file usage in libsvn_get_file()
24102 git-svn: bugfix and optimize the 'log' command
24103 git-svn: tests no longer fail if LC_ALL is not a UTF-8 locale
24104 git-svn: svn (command-line) 1.0.x compatibility
24105 git-svn: rebuild convenience and bugfixes
24106 git-svn: fix --rmdir when using SVN:: libraries
24107 rebase: Allow merge strategies to be used when rebasing
24108 rebase: error out for NO_PYTHON if they use recursive merge
24109 git-svn: fix commit --edit flag when using SVN:: libraries
24111 Florian Forster (9):
24112 gitweb: Adding a `blame' interface.
24113 gitweb: Make the `blame' interface in gitweb optional.
24114 Remove ranges from switch statements.
24115 Initialize FAMs using `FLEX_ARRAY'.
24116 Don't instantiate structures with FAMs.
24117 Cast pointers to `void *' when used in a format.
24118 Don't use empty structure initializers.
24119 Change types used in bitfields to be `int's.
24120 Remove all void-pointer arithmetic.
24122 Fredrik Kuivinen (1):
24123 blame: Add --time to produce raw timestamps
24125 Jakub Narebski (15):
24126 Update gitweb README: gitweb is now included with git
24127 Move gitweb style to gitweb.css
24128 gitweb: safely output binary files for 'blob_plain' action
24129 gitweb: text files for 'blob_plain' action without charset by default
24130 Fix gitweb stylesheet
24131 Make CSS file gitweb/gitweb.css more readable
24132 gitweb: add type="text/css" to stylesheet link
24133 Fix: Support for the standard mime.types map in gitweb
24134 gitweb: A couple of page title tweaking
24135 gitweb: style done with stylesheet
24136 gitweb: whitespace cleanup
24137 Add git version to gitweb output
24138 Move $gitbin earlier in gitweb.cgi
24139 gitweb: Make use of $PATH_INFO for project parameter
24140 gitweb: whitespace cleanup around '='
24142 Johannes Schindelin (6):
24143 diff options: add --color
24144 Initialize lock_file struct to all zero.
24145 Fix setting config variables with an alternative GIT_CONFIG
24146 Read configuration also from $HOME/.gitconfig
24147 repo-config: Fix late-night bug
24148 git_config: access() returns 0 on success, not > 0
24150 Junio C Hamano (31):
24151 Revert all the rev-list option parsing changes.
24152 Clean-up Geert's similarity fingerprint code.
24153 Extract "log [diff options]" parser out.
24154 whatchanged options parser fix.
24155 Built-in git-whatchanged
24157 Try using Geert similarity code in pack-objects.
24158 Retire rabinpoly fingerprinting code
24159 Fix mismerged update-index from jc/cache-tree branch.
24160 read-tree: --prefix=<path>/ option.
24161 write-tree: --prefix=<path>
24162 read-tree: reorganize bind_merge code.
24163 fetch-pack: give up after getting too many "ack continue"
24164 Fix earlier mismerges.
24165 shared repository: optionally allow reading to "others".
24166 gitk: rereadrefs needs listrefs
24168 t5100: mailinfo and mailsplit tests.
24169 mailinfo: ignore blanks after in-body headers.
24170 fix rfc2047 formatter.
24171 xdiff: minor changes to match libxdiff-0.21
24172 Restore SIGCHLD to SIG_DFL where we care about waitpid().
24173 checkout -f: do not leave untracked working tree files.
24174 upload-pack: avoid sending an incomplete pack upon failure
24175 upload-pack: prepare for sideband message support.
24176 Retire git-clone-pack
24177 upload-pack/fetch-pack: support side-band communication
24178 Add renaming-rebase test.
24179 daemon: send stderr to /dev/null instead of closing.
24180 rebase --merge: fix for rebasing more than 7 commits.
24181 Makefile: do not force unneeded recompilation upon GIT_VERSION changes
24183 Linus Torvalds (9):
24184 Tentative built-in "git show"
24185 gitweb.cgi history not shown
24186 Shrink "struct object" a bit
24187 Move "void *util" from "struct object" into "struct commit"
24188 Some more memory leak avoidance
24189 Remove "refs" field from "struct object"
24190 Add specialized object allocator
24191 Add "named object array" concept
24192 Fix grow_refs_hash()
24194 Lukas Sandström (6):
24195 Make git-write-tree a builtin
24196 Make git-mailsplit a builtin
24197 Make git-mailinfo a builtin
24198 Make git-stripspace a builtin
24199 Make git-update-index a builtin
24200 Make git-update-ref a builtin
24202 Martin Langhoff (3):
24203 cvsimport: ignore CVSPS_NO_BRANCH and impossible branches
24204 cvsimport: complete the cvsps run before starting the import
24205 cvsimport: keep one index per branch during import
24208 date.c: improve guess between timezone offset and year.
24210 Paul Mackerras (1):
24211 Fix PPC SHA1 routine for large input buffers
24214 Implement safe_strncpy() as strlcpy() and use it more.
24217 Support for extracting configuration from different files
24218 Support for the standard mime.types map in gitweb
24221 git-tar-tree: Simplify write_trailer()
24222 git-tar-tree: documentation update
24223 git-tar-tree: no more void pointer arithmetic
24224 Make release tarballs friendlier to older tar versions
24226 Sean Estabrooks (1):
24227 Add a "--notags" option for git-p4import.
24229 Sven Verdoolaege (1):
24230 git-cvsexportcommit.perl: fix typo
24233 gitweb: Use $hash_base as $search_hash if possible
24235 Uwe Kleine-König (1):
24236 Fix possible out-of-bounds array access
24239 auto-detect changed prefix and/or changed build flags
24240 Pass -DDEFAULT_GIT_TEMPLATE_DIR only where actually used.
24243 Version v1.4.0; changes since v1.4.0-rc2:
24244 -----------------------------------------
24246 Horst H. von Brand (1):
24247 Fix formatting of Documentation/git-clone.txt
24249 Junio C Hamano (7):
24250 allow working in repositories with textual symref HEAD
24251 git-clone: fix duplicated "master" in $GIT_DIR/remotes/origin
24252 git-rm: honor -n flag.
24253 builtin-init-db: spell the in-program configuration variable in lowercase.
24254 shared repository - add a few missing calls to adjust_shared_perm().
24255 git-clone: fix --bare over dumb-http
24259 first working version
24336 Make the tag view look like commit header.
24337 allow sorting of index page by project path, owner and age
24338 make index page sorting more visible and increase RSS item count
24339 fix search parsing, later git does not print a trailing space
24340 don't chop_str if adding ... is longer than the original
24341 Show tooltips (like this one :)) containing full titles for truncated commit titles in the summary and shortlog views.
24344 common input validation to allow passing of textual hash id's
24346 translate reference into hash while reading a commit
24347 fix typo in link parameter of git_commit
24349 switch to git-rev-list for commit reading
24351 start searching at the current $hash value
24353 rename "branches" to "heads"
24355 provide filename for "save as" in plaintext views
24356 add Expires: +1d header to commit and commitdiff pages
24359 update the test files to have a diff
24360 escape '+' and ' ' in url's
24361 make ' ' and '+' in filenames some kind of working
24363 escape ' ' with '+' in url's
24364 replace invalid utf8 sequences by UTF-8 REPLACEMENT CHARACTER (efbfbd)
24366 add missing esc() rename
24372 add broken latin encoding to test file
24373 set logo output to raw mode
24375 allow utf8 characters in url parameter escape
24378 fix quoted filename lookup
24380 fix "rename" output
24386 attach tag to the link
24389 fix leading whitespace in commit text
24391 define default colors
24393 resolve textual hashes when looking up "refs"
24395 fix: Use of uninitialized value
24397 handle utf8 characters from /etc/passwd
24399 remove Christian's email address
24404 check for error return from fork()
24407 Built-in git-get-tar-commit-id
24410 prepend '--' to filelist when calling git-diff-tree
24412 Uwe Kleine-König (1):
24413 Document git-clone --use-separate-remote
24416 Add <author> and <guid> to RSS feed
24419 Version v1.4.0-rc2; changes since v1.4.0-rc1:
24420 ---------------------------------------------
24423 Some doc typo fixes
24424 config.txt grammar, typo, and asciidoc fixes
24425 git-cvsserver asciidoc formatting tweaks
24427 Horst H. von Brand (1):
24428 Cleanup git-send-email.perl:extract_valid_email
24430 Johannes Schindelin (1):
24431 If you have a config containing something like this:
24434 Refactor git_tcp_connect() functions a little.
24437 Misc doc improvements
24438 Document git-ls-tree --fullname
24440 Junio C Hamano (12):
24441 git alias: try alias last.
24442 send-email: be more lenient and just catch obvious mistakes.
24443 send-email: a bit more careful domain regexp.
24444 git-format-patch: add --output-directory long option again
24446 Make index file locking code reusable to others.
24447 refs.c: convert it to use lockfile interface.
24448 ref-log: style fixes.
24449 Documentation: add missing docs make check-docs found.
24450 make clean: remove dist-doc targets.
24451 Documentation: git-ls-tree (typofix)
24452 Documentation: add another example to git-ls-files
24454 Nick Hengeveld (2):
24456 http-fetch: fix possible segfault
24458 Paul Mackerras (12):
24459 gitk: Make a row of controls for controlling highlighting
24460 gitk: Highlight entries in the file list as well
24461 gitk: Highlight paths of interest in tree view as well
24462 gitk: First cut at a search function in the patch/file display window
24463 gitk: Improve the text window search function
24464 gitk: Move "pickaxe" find function to highlight facility
24465 gitk: Fix bug in highlight stuff when no line is selected
24466 gitk: Provide ability to highlight based on relationship to selected commit
24467 gitk: Add a goto next/previous highlighted commit function
24468 gitk: Show nearby tags
24469 gitk: Show branch name(s) as well, if "show nearby tags" is enabled
24470 gitk: Re-read the descendent/ancestor tag & head info on update
24473 Document git aliases support
24474 Documentation: git aliases
24477 Off-by-one error in get_path_prefix(), found by Valgrind
24479 Robert Fitzsimons (1):
24480 builtin-grep: pass ignore case option to external grep
24483 Version v1.4.0-rc1; changes since v1.3.3:
24484 -----------------------------------------
24487 make update-index --chmod work with multiple files and --stdin
24488 remove superflous "const"
24490 Aneesh Kumar K.V (3):
24491 gitview: Add key binding for F5.
24492 gitview: Move the console error messages to message dialog
24493 gitview: Add some useful keybindings.
24495 Björn Engelmann (2):
24496 remove the artificial restriction tagsize < 8kb
24497 add more informative error messages to git-mktag
24499 Catalin Marinas (1):
24500 Add a test-case for git-apply trying to add an ending line
24502 Christian Couder (1):
24503 Builtin git-rev-parse.
24505 Dennis Stosberg (3):
24506 git-write-tree writes garbage on sparc64
24507 git-clean fails on files beginning with a dash
24508 Update documentation for git-format-patch
24510 Dmitry V. Levin (2):
24511 execv_git_cmd: Fix stack buffer overflow.
24512 git_exec_path, execv_git_cmd: ignore empty environment variables
24515 git-cvsimport: Handle "Removed" from pserver
24517 Eric W. Biederman (8):
24518 Implement git-quiltimport
24519 Implement a --dry-run option to git-quiltimport
24520 Make read_one_header_line return a flag not a length.
24521 Move B and Q decoding into check header.
24522 Refactor commit messge handling.
24523 In handle_body only read a line if we don't already have one.
24524 More accurately detect header lines in read_one_header_line
24525 Allow in body headers beyond the in body header prefix.
24528 git-svn: documentation updates
24530 send-email: address expansion for common mailers
24531 Install git-send-email by default
24532 send-email: allow sendmail binary to be used instead of SMTP
24533 send-email: quiet some warnings, reject invalid addresses
24534 commit: allow --pretty= args to be abbreviated
24535 git-svn: starting a 1.1.0-pre development version
24536 git-svn: ignore expansion of svn:keywords
24537 t3300-funny-names: shell portability fixes
24538 tests: Remove heredoc usage inside quotes
24539 t5500-fetch-pack: remove local (bashism) usage.
24540 t6000lib: workaround a possible dash bug
24541 git-svn: t0001: workaround a heredoc bug in old versions of dash
24542 git-svn: remove assertion that broke with older versions of svn
24544 Florian Forster (1):
24545 git-svnimport: Improved detection of merges.
24547 Fredrik Kuivinen (2):
24548 blame: Fix path pruning
24549 Update the documentation for git-merge-base
24551 Horst H. von Brand (4):
24552 Fix some documentation typoes
24553 Documentation: Spelling fixes
24554 Add example xinetd(8) configuration to Documentation/everyday.txt
24555 Fix Documentation/everyday.txt: Junio's workflow
24557 J. Bruce Fields (7):
24558 tutorial: replace "whatchanged" by "log"
24559 tutorial: expanded discussion of commit history
24560 tutorial: add discussion of index file, object database
24561 documentation: mention gitk font adjustment in tutorial
24562 documentation: add brief mention of cat-file to tutorial part I
24563 Documentation: retitle the git-core tutorial
24564 Documentation: fix a tutorial-2 typo
24567 cvsimport: use git-update-index --index-info
24568 cvsimport: cleanup commit function
24569 cvsimport: set up commit environment in perl instead of using env
24570 cat-file: document -p option
24571 cvsimport: avoid "use" with :tag
24572 handle concurrent pruning of packed objects
24573 sha1_file: avoid re-preparing duplicate packs
24576 Don't write directly to a make target ($@).
24578 Johannes Schindelin (25):
24579 builtin-push: resurrect parsing of Push: lines
24580 cache-tree: replace a sscanf() by two strtol() calls
24581 builtin-push: also ask config for remote information
24582 fetch, pull: ask config for remote information
24583 repo-config: fix segfault with no argument.
24584 repo-config: trim white-space before comment
24585 repo-config: support --get-regexp
24586 repo-config: deconvolute logics
24587 fetch, pull: ask config for remote information
24588 Add a conversion tool to migrate remote information into the config
24589 builtin-push: --all and --tags _are_ explicit refspecs
24590 Teach fmt-patch to write individual files.
24591 fmt-patch: output file names to stdout
24592 fmt-patch: implement -o <dir>
24593 Teach fmt-patch about --numbered
24594 Teach fmt-patch about --keep-subject
24595 fmt-patch: understand old <his> notation
24596 Fix users of prefix_path() to free() only when necessary
24597 Fix users of prefix_path() to free() only when necessary
24598 Fix crash when reading the empty tree
24599 diff family: add --check option
24600 fmt-patch: Support --attach
24601 git-format-patch --start-number <n>
24602 send-email: only 'require' instead of 'use' Net::SMTP
24603 format-patch: resurrect extra headers from config
24605 Josef Weidendorfer (1):
24606 gitk: Add a visual tag for remote refs
24608 Junio C Hamano (156):
24609 Fix up default abbrev in setup_revisions() argument parser.
24610 Fix up rev-list option parsing.
24611 Split init_revisions() out of setup_revisions()
24612 rev-list option parser fix.
24613 Built-in git-whatchanged.
24614 Do not fork PAGER=cat
24615 Simplify common default options setup for built-in log family.
24616 log/whatchanged/show - log formatting cleanup.
24617 rev-list --header: output format fix
24618 git.c: LOGSIZE is unused after log printing cleanup.
24619 combine-diff: show diffstat with the first parent.
24620 Fix "git log --stat": make sure to set recursive with --stat.
24621 Tentative built-in format-patch.
24622 sha1_name.c: prepare to make get_tree_entry() reusable from others.
24623 sha1_name.c: no need to include diff.h; tree-walk.h will do.
24624 get_tree_entry(): make it available from tree-walk
24625 Minor tweak on subject line in --pretty=email
24626 diff: move diff.c to diff-lib.c to make room.
24627 Add git-unresolve <paths>...
24628 diff --stat: do not drop rename information.
24629 git-update-index --unresolve
24630 rename internal format-patch wip
24631 Makefile: dependency for builtin-help.o
24632 Add colordiff for git to contrib/colordiff.
24633 Fix "git show --stat"
24636 git-fmt-patch: thinkofix to show [PATCH] properly.
24637 Libified diff-index: backward compatibility fix.
24638 read-cache/write-cache: optionally return cache checksum SHA1.
24640 Update write-tree to use cache-tree.
24641 Invalidate cache-tree entries for touched paths in git-apply.
24642 Use cache-tree in update-index.
24643 Add test-dump-cache-tree
24644 cache-tree: protect against "git prune".
24645 index: make the index file format extensible.
24646 Teach fsck-objects about cache-tree.
24647 cache-tree: sort the subtree entries.
24648 test-dump-cache-tree: report number of subtrees.
24649 Makefile: remove and create libgit.a from scratch.
24650 diff --stat: show complete rewrites consistently.
24651 git-cvsserver: typofixes
24652 t0000-basic: Add ls-tree recursive test back.
24653 Makefile: remove and create xdiff library from scratch.
24654 commit-tree: allow generic object name for the tree as well.
24655 revision parsing: make "rev -- paths" checks stronger.
24656 t0000-basic: more commit-tree tests.
24657 update-index: when --unresolve, smudge the relevant cache-tree entries.
24658 read-tree: teach 1 and 2 way merges about cache-tree.
24659 read-tree: teach 1-way merege and plain read to prime cache-tree.
24660 diff-index: fix compilation warnings.
24661 cache_tree_update: give an option to update cache-tree only.
24662 test-dump-cache-tree: validate the cached data as well.
24663 pack-objects: update size heuristucs.
24664 built-in count-objects.
24665 cache-tree.c: typefix
24667 built-in diff: assorted updates.
24668 builtin-diff.c: die() formatting type fix.
24669 Fix builtin-push to honor Push: lines in remotes file.
24670 Extended SHA1 -- "rev^@" syntax to mean "all parents"
24671 get_sha1(): :path and :[0-3]:path to extract from index.
24672 built-in "git grep"
24673 Use RFC2822 dates from "git fmt-patch".
24674 builtin-grep: wildcard pathspec fixes
24675 builtin-grep: support '-l' option.
24676 builtin-grep: do not use setup_revisions()
24677 fsck-objects: mark objects reachable from cache-tree
24678 builtin-count-objects: make it official.
24679 builtin-diff: call it "git-diff", really.
24680 builtin-log/whatchanged/show: make them official.
24681 show-branch: omit uninteresting merges.
24682 builtin-push: make it official.
24683 builtin-grep: printf %.*s length is int, not ptrdiff_t.
24684 Revert "fetch, pull: ask config for remote information"
24685 builtin-grep: allow -<n> and -[ABC]<n> notation for context lines.
24686 builtin-grep: allow more than one patterns.
24687 builtin-grep: support -c (--count).
24688 builtin-grep: support -w (--word-regexp).
24689 builtin-grep: tighten path wildcard vs tree traversal.
24690 core.prefersymlinkrefs: use symlinks for .git/HEAD
24691 repo-config: readability fixups.
24692 builtin-count-objects: open packs when running -v
24693 Fix test-dump-cache-tree in one-tree disappeared case.
24694 read-tree: invalidate cache-tree entry when a new index entry is added.
24695 cache-tree: a bit more debugging support.
24696 builtin-grep: terminate correctly at EOF
24697 builtin-grep: binary files -a and -I
24698 fsck-objects: do not segfault on missing tree in cache-tree
24699 builtin-grep: -L (--files-without-match).
24700 Makefile: do not link rev-list any specially.
24701 delta: stricter constness
24702 pack-object: squelch eye-candy on non-tty
24704 binary diff: further updates.
24705 update-index --unresolve: work from a subdirectory.
24706 checkout-index: plug memory leak from prefix_path()
24707 update-index: plug memory leak from prefix_path()
24708 update-index --again
24709 update-index --again: take optional pathspecs
24710 binary diff and apply: testsuite.
24711 Teach -f <file> option to builtin-grep.
24712 builtin-grep: documentation
24713 get_sha1() - fix infinite loop on nonexistent stage.
24714 Teach git-clean optional <paths>... parameters.
24715 builtin-grep: tighten argument parsing.
24716 builtin-grep: typofix
24717 builtin-grep: -w fix
24718 builtin-grep: -F (--fixed-strings)
24719 checkout: use --aggressive when running a 3-way merge (-m).
24720 diffstat rename squashing fix.
24721 read-tree -u one-way merge fix to check out locally modified paths.
24722 apply --numstat: show new name, not old name.
24723 builtin-grep: unparse more command line options.
24724 apply --cached: apply a patch without using working tree.
24725 git-am: use apply --cached
24726 builtin-diff: fix comparison between two blobs.
24727 merge-base: Clarify the comments on post processing.
24728 read-tree -m -u: do not overwrite or remove untracked working tree files.
24729 builtin-grep: workaround for non GNU grep.
24730 Revert "builtin-grep: workaround for non GNU grep."
24731 apply --cached: do not check newly added file in the working tree
24732 builtin-add: fix unmatched pathspec warnings.
24733 builtin-diff: do not say files are renamed when blob and file are given
24734 Fix build procedure for builtin-init-db
24735 built-in tar-tree and remote tar-tree
24736 git-format-patch: now built-in.
24737 checkdiff_consume: strtol parameter fix.
24738 git-rebase: use canonical A..B syntax to format-patch
24739 tutorial-2: typofix in examples.
24740 mailinfo: skip bogus UNIX From line inside body
24741 CMIT_FMT_EMAIL: Q-encode Subject: and display-name part of From: fields.
24742 builtin format-patch: squelch content-type for 7-bit ASCII
24743 diff: minor option combination fix.
24744 fetch-pack: output refs in the order they were given on the command line.
24745 Tutorial #2: broken link fix.
24746 builtin-rm: squelch compiler warnings.
24747 cvsimport: do not barf on creation of an empty file.
24748 apply: force matching at the beginning.
24749 fetch.c: remove an unused variable and dead code.
24750 ls-remote: fix rsync:// to report HEAD
24751 mailinfo: More carefully parse header lines in read_one_header_line()
24752 gitk: start-up bugfix
24753 built-in format-patch: various fixups.
24754 format-patch: -n and -k are mutually exclusive.
24755 Let git-clone to pass --template=dir option to git-init-db.
24756 git-fetch: avoid using "case ... in (arm)"
24757 adjust to the rebased series by Linus.
24758 send-email: do not pass bogus address to local sendmail binary
24759 format-patch --signoff
24760 fetch.c: do not pass uninitialized lock to unlock_ref().
24761 fetch.c: do not call process_tree() from process_tree().
24762 fetch: do not report "same" unless -verbose.
24763 read-tree --reset: update working tree file for conflicted paths.
24764 rev-parse: tighten constness properly.
24766 Linus Torvalds (60):
24767 Common option parsing for "git log --diff" and friends
24768 Tentative built-in "git show"
24769 Fixes for option parsing
24770 Log message printout cleanups
24771 Log message printout cleanups (#2)
24772 Log message printout cleanups (#3): fix --pretty=oneline
24773 Fix uninteresting tags in new revision parsing
24774 get_sha1() shorthands for blob/tree objects
24775 Allow "git repack" users to specify repacking window/depth
24776 git log: don't do merge diffs by default
24777 Split up builtin commands into separate files from git.c
24778 Fix "git help -a" terminal autosizing
24780 Fix "git-log --parents" breakage post v1.3.0
24781 sha1_to_hex() usage cleanup
24782 git diff: support "-U" and "--unified" options properly
24783 Allow one-way tree merge to remove old files
24784 Simplify "git reset --hard"
24785 builtin-grep: use external grep when we can take advantage of it
24786 read-tree --reset -u fix.
24787 Fix silly typo in new builtin grep
24788 Remove old "git-grep.sh" remnants
24789 libify git-ls-files directory traversal
24790 Clean up git-ls-file directory walking library interface
24791 Do "git add" as a builtin
24792 builtin-add: warn on unmatched pathspecs
24793 builtin-grep: workaround for non GNU grep.
24794 Remove old "git-add.sh" remnants
24795 Prevent bogus paths from being added to the index.
24796 Make "git rev-list" be a builtin
24797 Libify the index refresh logic
24798 Move pathspec matching from builtin-add.c into dir.c
24799 Add builtin "git rm" command
24800 cvsimport: repack every kilo-commits.
24801 apply: treat EOF as proper context.
24802 Clean up sha1 file writing
24803 bogus "fatal: Not a git repository"
24804 t1002: use -U0 instead of --unified=0
24805 Fix "--abbrev=xyz" for revision listing
24806 Fix memory leak in "git rev-list --objects"
24807 Don't use "sscanf()" for tree mode scanning
24808 Add raw tree buffer info to "struct tree"
24809 Make "tree_entry" have a SHA1 instead of a union of object pointers
24810 Switch "read_tree_recursive()" over to tree-walk functionality
24811 Remove "tree->entries" tree-entry list from tree parser
24812 Make "struct tree" contain the pointer to the tree buffer
24813 Make "tree_entry" have a SHA1 instead of a union of object pointers
24814 Switch "read_tree_recursive()" over to tree-walk functionality
24815 builtin-read-tree.c: avoid tree_entry_list in prime_cache_tree_rec()
24816 Remove "tree->entries" tree-entry list from tree parser
24817 fsck-objects: avoid unnecessary tree_entry_list usage
24818 Remove unused "zeropad" entry from tree_list_entry
24819 Convert "mark_tree_uninteresting()" to raw tree walker
24820 Convert fetch.c: process_tree() to raw tree walker
24821 Remove last vestiges of generic tree_entry_list
24822 tree_entry(): new tree-walking helper function
24823 read-tree: fix eye-candy.
24824 Fix typo in tutorial-2.txt
24825 rev-list: fix process_tree() conversion.
24826 pack-objects: improve path grouping heuristics.
24828 Lukas Sandström (2):
24829 Make git-check-format-ref a builtin.
24830 SubmittingPatches: The download location of External Editor has moved
24832 Martin Langhoff (7):
24833 git-cvsexportcommit: Add -f(orce) and -m(essage prefix) flags, small cleanups.
24834 cvsserver: use git-rev-list instead of git-log
24835 cvsserver: use git-rev-list instead of git-log
24836 cvsimport: minor fixups
24837 cvsimport: replace anonymous sub ref with a normal sub
24838 cvsimport: introduce -L<imit> option to workaround memory leaks
24839 cvsimport: introduce _fetchfile() method and used a 1M buffer to read()
24842 Transitively read alternatives
24843 test case for transitive info/alternates
24844 clone: don't clone the info/alternates file
24845 git help: remove whatchanged from list of common commands
24846 Documentation/Makefile: remove extra /
24847 Add instructions to commit template.
24850 Added logged warnings for CVS error returns
24851 Many fixes for most operations in Eclipse.
24852 Change to allow subdir updates from Eclipse
24854 Matthias Kestenholz (1):
24855 add documentation for update-index --unresolve
24857 Matthias Lederhofer (1):
24858 git status: skip empty directories, and add -u to show all untracked files
24860 Nick Hengeveld (3):
24861 git-fetch: resolve remote symrefs for HTTP transport
24862 http: prevent segfault during curl handle reuse
24863 builtin-push: don't pass --thin to HTTP transport
24865 Nicolas Pitre (10):
24866 split the diff-delta interface
24867 use delta index data when finding best delta matches
24868 replace adler32 with Rabin's polynomial in diff-delta
24869 tiny optimization to diff-delta
24870 improve diff-delta with sparse and/or repetitive data
24871 improve base85 generated assembly code
24872 fix diff-delta bad memory access
24873 simple euristic for further free packing improvements
24874 pack-object: slightly more efficient
24875 improve depth heuristic for maximum delta size
24877 Paul Mackerras (19):
24878 gitk: Implement multiple views
24879 gitk: Make File->Update work properly again
24880 gitk: Fix various bugs in the view support
24881 gitk: Don't reread git-rev-list output from scratch on view switch
24882 gitk: Remember the view in the history list
24883 gitk: Let git-rev-list do the argument list parsing
24884 gitk: Use git-rev-parse only to identify file/dir names on cmd line
24885 gitk: Implement "permanent" views (stored in ~/.gitk)
24886 gitk: add menu item for editing the current view
24887 gitk: Use a text widget for the file list
24888 gitk: Add a tree-browsing mode
24889 gitk: Basic support for highlighting one view within another
24890 gitk: Fix file list display when files are renamed
24891 gitk: Allow view to specify arbitrary arguments to git-rev-list
24892 gitk: Fix display of "(...)" for parents/children we haven't drawn
24893 Provide a way to flush git-diff-tree's output
24894 gitk: Fix bug where page-up/down wouldn't always work properly
24895 gitk: show_error fix
24896 Make git-diff-tree indicate when it flushes
24899 Add git-quiltimport to .gitignore.
24900 Builtin git-ls-files.
24901 Builtin git-ls-tree.
24902 Builtin git-tar-tree.
24903 Builtin git-read-tree.
24904 Builtin git-commit-tree.
24906 Builtin git-show-branch.
24907 Builtin git-diff-files, git-diff-index, git-diff-stages, and git-diff-tree.
24909 Peter Hagervall (1):
24910 Sparse fix for builtin-diff
24913 git-repo-config --list support
24914 Deprecate usage of git-var -l for getting config vars list
24915 Call builtin ls-tree in git-cat-file -p
24918 git-send-email: Add References: headers to emails, in addition to In-Reply-To:
24919 Add support for --bcc to git-send-email.
24920 Fix a bug in email extraction used in git-send-email.
24921 Add a basic test case for git send-email, and fix some real bugs discovered.
24923 Salikh Zakirov (1):
24924 Fixed Cygwin CR-munging problem in mailsplit
24927 Document that "git add" only adds non-ignored files.
24929 Sean Estabrooks (19):
24930 Add --continue and --abort options to git-rebase.
24931 Several trivial documentation touch ups.
24932 Fix up docs where "--" isn't displayed correctly.
24933 Update git-unpack-objects documentation.
24934 Clarify git-cherry documentation.
24935 Another config file parsing fix.
24936 t1300-repo-config: two new config parsing tests.
24937 Add "--branches", "--tags" and "--remotes" options to git-rev-parse.
24938 Make git rebase interactive help match documentation.
24939 Add "--summary" option to git diff.
24940 Convert some "apply --summary" users to "diff --summary".
24941 Strip useless "tags/" prefix from git-tag -l output
24942 Allow pickaxe and diff-filter options to be used by git log.
24943 Avoid segfault in diff --stat rename output.
24944 Change GIT-VERSION-GEN to call git commands with "git" not "git-".
24945 Install git builtins into gitexecdir rather than bindir.
24946 Remove possible segfault in http-fetch.
24947 --summary output should print immediately after stats.
24948 A Perforce importer for git.
24950 Serge E. Hallyn (1):
24951 socksetup: don't return on set_reuse_addr() error
24954 gitk: Display commit messages with word wrap
24956 Shawn O. Pearce (24):
24957 Remove unnecessary local in get_ref_sha1.
24958 Improve abstraction of ref lock/write.
24959 Convert update-ref to use ref_lock API.
24960 Log ref updates to logs/refs/<ref>
24961 Support 'master@2 hours ago' syntax
24962 Fix ref log parsing so it works properly.
24963 General ref log reading improvements.
24964 Added logs/ directory to repository layout.
24965 Force writing ref if it doesn't exist.
24966 Log ref updates made by fetch.
24967 Change 'master@noon' syntax to 'master@{noon}'.
24968 Correct force_write bug in refs.c
24969 Change order of -m option to update-ref.
24970 Include ref log detail in commit, reset, etc.
24971 Create/delete branch ref logs.
24972 Enable ref log creation in git checkout -b.
24973 Reference git-check-ref-format in git-branch.
24974 Elaborate on why ':' is a bad idea in a ref name.
24975 Built git-upload-tar should be ignored.
24976 Verify git-commit provides a reflog message.
24977 Test that git-branch -l works.
24978 Remove unnecessary output from t3600-rm.
24979 Improved pack format documentation.
24980 Allow multiple -m options to git-commit.
24982 Tilman Sauerbeck (1):
24983 Documentation/Makefile: create tarballs for the man pages and html files
24986 Builtin git-init-db
24987 Builtin git-cat-file
24988 gitk: Replace "git-" commands with "git "
24991 NO_INET_NTOP and compat/inet_ntop.c for some systems (e.g. old Cygwin).
24992 Problem: 'trap...exit' causes error message when /bin/sh is ash.
24995 Do not call 'cmp' with non-existant -q flag.
24996 Document current cvsexportcommit limitations.
24997 Make cvsexportcommit create parent directories as needed.
25000 Version v1.3.3; changes since v1.3.2:
25001 -------------------------------------
25004 include header to define uint32_t, necessary on Mac OS X
25006 Dennis Stosberg (2):
25007 Fix git-pack-objects for 64-bit platforms
25008 Fix compilation on newer NetBSD systems
25010 Dmitry V. Levin (1):
25011 Separate object name errors from usage errors
25014 apply: fix infinite loop with multiple patches with --index
25015 Install git-send-email by default
25017 Johannes Schindelin (1):
25018 repo-config: trim white-space before comment
25020 Junio C Hamano (6):
25021 core.prefersymlinkrefs: use symlinks for .git/HEAD
25022 repo-config: document what value_regexp does a bit more clearly.
25023 Fix repo-config set-multivar error return path.
25024 Documentation: {caret} fixes (git-rev-list.txt)
25025 checkout: use --aggressive when running a 3-way merge (-m).
25026 Fix pack-index issue on 64-bit platforms a bit more portably.
25028 Linus Torvalds (3):
25029 Fix "git diff --stat" with long filenames
25030 revert/cherry-pick: use aggressive merge.
25031 git config syntax updates
25034 clone: keep --reference even with -l -s
25035 repack: honor -d even when no new pack was created
25037 Matthias Lederhofer (1):
25038 core-tutorial.txt: escape asterisk
25041 Release config lock if the regex is invalid
25043 Sean Estabrooks (3):
25044 Fix for config file section parsing.
25045 Another config file parsing fix.
25046 Ensure author & committer before asking for commit message.
25049 read-cache.c: use xcalloc() not calloc()
25052 Version v1.3.2; changes since v1.3.1:
25053 -------------------------------------
25056 git-format-patch: Use rfc2822 compliant date.
25059 Alphabetize the glossary.
25060 Added definitions for a few words:
25061 Add a few more words to the glossary.
25063 Junio C Hamano (4):
25065 commit-tree.c: check_valid() microoptimization.
25066 verify-pack: check integrity in a saner order.
25067 git-am --resolved: more usable error message.
25069 Linus Torvalds (1):
25070 Fix filename verification when in a subdirectory
25072 Martin Langhoff (1):
25073 git-send-email: fix version string to be valid perl
25075 Matthias Kestenholz (3):
25076 annotate: fix warning about uninitialized scalar
25077 annotate: display usage information if no filename was given
25078 fix various typos in documentation
25080 Robert Shearman (1):
25081 Give the user a hint for how to continue in the case that git-am fails because it requires user intervention
25083 Sean Estabrooks (4):
25084 Update the git-branch man page to include the "-r" option,
25085 Fix up remaining man pages that use asciidoc "callouts".
25086 Properly render asciidoc "callouts" in git man pages.
25087 Fix trivial typo in git-log man page.
25090 Version v1.3.1; changes since v1.3.0:
25091 -------------------------------------
25094 Fix filename scaling for binary files
25096 Junio C Hamano (5):
25097 git-merge: a bit more readable user guidance.
25098 pre-commit hook: complain about conflict markers.
25099 git-commit --amend: two fixes.
25100 pack-objects: do not stop at object that is "too small"
25101 mailinfo: decode underscore used in "Q" encoding properly.
25103 Linus Torvalds (1):
25104 git-log produces no output
25107 fix pack-object buffer size
25109 Paul Mackerras (1):
25110 rev-parse: better error message for ambiguous arguments
25113 Document git-var -l listing also configuration variables
25114 Document the configuration file
25117 Reintroduce svn pools to solve the memory leak.
25119 Serge E. Hallyn (1):
25120 socksetup: don't return on set_reuse_addr() error
25122 Shawn O. Pearce (1):
25123 Document git-clone --reference
25126 Version v1.3.0; changes since v1.3.0-rc4:
25127 -----------------------------------------
25129 A Large Angry SCM (1):
25132 Herbert Valerio Riedel (1):
25133 git-svnimport symlink support
25135 Johannes Schindelin (2):
25136 diff-options: add --patch-with-stat
25137 pager: do not fork a pager if PAGER is set to empty.
25140 Add git-annotate(1) and git-blame(1)
25142 Junio C Hamano (9):
25143 rev-list --bisect: limit list before bisecting.
25144 diff-tree: typefix.
25145 diff --stat: do not do its own three-dashes.
25146 diff-files --stat: do not dump core with unmerged index.
25147 reading $GIT_DIR/info/graft - skip comments correctly.
25148 rev-list --boundary: show boundary commits even when limited otherwise.
25149 packed_object_info_detail(): check for corrupt packfile.
25150 diff --stat: make sure to set recursive.
25153 Linus Torvalds (1):
25154 Support "git cmd --help" syntax
25156 Paul Mackerras (1):
25157 gitk: Fix bug caused by missing commitlisted elements
25159 Serge E. Hallyn (5):
25160 cleanups: Fix potential bugs in connect.c
25161 cleanups: Remove unused vars from combine-diff.c
25162 cleanups: Remove impossible case in quote.c
25163 cleanups: prevent leak of two strduped strings in config.c
25164 cleanups: remove unused variable from exec_cmd.c
25167 Allow empty lines in info/grafts
25170 Version v1.3.0-rc4; changes since v1.3.0-rc3:
25171 ---------------------------------------------
25173 Davide Libenzi (1):
25174 xdiff: post-process hunks to make them consistent.
25176 Dennis Stosberg (2):
25177 Solaris 9 also wants our own unsetenv/setenv.
25178 Replace index() with strchr().
25180 Eric W. Biederman (1):
25181 Implement limited context matching in git-apply.
25183 Johannes Schindelin (2):
25184 diff-options: add --stat (take 2)
25185 diff-options: add --stat (take 2)
25187 Junio C Hamano (31):
25188 git-log: match rev-list --abbrev and --abbrev-commit
25189 diff: fix output of total-rewrite diff.
25190 diffcore-rename: fix merging back a broken pair.
25191 log-tree: separate major part of diff-tree.
25192 git log [diff-tree options]...
25193 Retire diffcore-pathspec.
25194 tree-diff: do not assume we use only one pathspec
25195 git log --full-diff
25197 blame and friends: adjust to multiple pathspec change.
25198 Retire git-log.sh (take#2)
25199 diff-* --patch-with-raw
25200 Retire git-log.sh (take #3)
25201 combine-diff: do not lose hunks with only deletion at end.
25202 combine-diff: fix hunks at the end (take #2).
25203 Retire t5501-old-fetch-and-upload test.
25204 git-commit: do not muck with commit message when no_edit is set.
25205 stripspace: make sure not to leave an incomplete line.
25206 combine-diff: type fix.
25207 Documentation: add a couple of missing docs.
25208 Makefile: $(MAKE) check-docs
25209 git-log: do not output excess blank line between commits
25210 t3600-rm: skip failed-remove test when we cannot make an unremovable file.
25211 Fix-up previous expr changes.
25212 diff --stat: no need to ask funcnames nor context.
25214 stripspace: incomplete line fix (take #2)
25215 Retire git-log.sh (take #4)
25216 git-log <diff-options> <paths> documentation
25217 "git cmd -h" for shell scripts.
25220 Linus Torvalds (4):
25221 Make "--parents" logs also be incremental
25222 When showing a commit message, do not lose an incomplete line.
25223 Use less memory in "git log"
25224 Clean up trailing whitespace when pretty-printing commits
25227 xdiff/xdiffi.c: fix warnings about possibly uninitialized variables
25230 Shell utilities: Guard against expr' magic tokens.
25233 Improve the git-diff-tree -c/-cc documentation
25234 Document --patch-with-raw
25235 Separate the raw diff and patch with a newline
25238 Version v1.3.0-rc3; changes since v1.3.0-rc2:
25239 ---------------------------------------------
25242 Tweaks to make asciidoc play nice.
25244 Johannes Schindelin (3):
25245 cvsimport: use git-update-ref when updating
25246 On some platforms, certain headers need to be included before regex.h
25247 Fix compile with expat, but an old curl version
25250 Added Packing Heursitics IRC writeup.
25252 Junio C Hamano (16):
25253 git-clone: fix handling of upsteram whose HEAD does not point at master.
25254 combine-diff: use built-in xdiff.
25255 parse_date(): fix parsing 03/10/2006
25256 combine-diff: refactor built-in xdiff interface.
25257 diff_flush(): leakfix.
25258 combine-diff: move the code to parse hunk-header into common library.
25259 blame: use built-in xdiff
25260 date parsing: be friendlier to our European friends.
25261 blame.c: fix completely broken ancestry traversal.
25262 Match ofs/cnt types in diff interface.
25263 blame -S <ancestry-file>
25264 Add Documentation/technical/pack-format.txt
25265 Thin pack generation: optimization.
25266 rev-list --abbrev-commit
25267 count-delta: match get_delta_hdr_size() changes.
25270 Karl Hasselström (1):
25271 git-svnimport: Don't assume that copied files haven't changed
25274 Provide configurable UI font for gitk
25277 git-commit: document --amend
25280 gitk: Use git wrapper to run git-ls-remote.
25282 Mike McCormack (3):
25283 Avoid a divide by zero if there's no messages to send.
25284 Avoid a crash if realloc returns a different pointer.
25285 Add documentation for git-imap-send.
25287 Nick Hengeveld (1):
25288 http-fetch: add optional DAV-based pack list
25291 check patch_delta bounds more carefully
25293 Paul Mackerras (3):
25294 gitk: replace parent and children arrays with lists
25295 gitk: Add a help menu item to display key bindings
25296 gitk: Fix incorrect invocation of getmergediffline
25299 Add git-clean command
25300 gitk: Fix searching for filenames in gitk
25303 Support for pickaxe matching regular expressions
25305 Rutger Nijlunsing (1):
25306 gitk: add key bindings for selecting first and last commit
25308 Stephen Rothwell (1):
25309 gitk: allow goto heads
25312 Version v1.3.0-rc2; changes since v1.3.0-rc1:
25313 ---------------------------------------------
25315 Davide Libenzi (1):
25316 Clean-up trivially redundant diff.
25319 contrib/git-svn: force GIT_DIR to an absolute path
25320 contrib/git-svn: accept configuration via repo-config
25321 contrib/git-svn: documentation updates
25322 contrib/git-svn: ensure repo-config returns a value before using it
25323 contrib/git-svn: make sure our git-svn is up-to-date for test
25324 contrib/git-svn: handle array values correctly
25326 J. Bruce Fields (1):
25327 Documentation: revise top of git man page
25330 Add ALL_LDFLAGS to the git target.
25331 Use sigaction and SA_RESTART in read-tree.c; add option in Makefile.
25334 fix repacking with lots of tags
25336 Junio C Hamano (14):
25337 rev-list --no-merges: argument parsing fix.
25338 rev-list: memory usage reduction.
25339 rev-list --boundary
25340 revision arguments: ..B means HEAD..B, just like A.. means A..HEAD
25341 revision.c "..B" syntax: constness fix
25342 assume unchanged git: diff-index fix.
25343 tree/diff header cleanup.
25344 rev-list --boundary: fix re-injecting boundary commits.
25345 Makefile: many programs now depend on xdiff/lib.a having been built.
25346 revision: --topo-order and --unpacked
25347 revision: simplify argument parsing.
25348 revision: --max-age alone does not need limit_list() anymore.
25349 safe_fgets() - even more anal fgets()
25352 Linus Torvalds (5):
25353 Move "--parent" parsing into generic revision.c library code
25354 Make path-limiting be incremental when possible.
25355 revision: Fix --topo-order and --max-age with reachability limiting.
25356 Fix Solaris stdio signal handling stupidities
25357 pack-objects: be incredibly anal about stdio semantics
25360 xdiff: Show function names in hunk headers.
25362 Nick Hengeveld (2):
25363 git-ls-remote: send no-cache header when fetching info/refs
25364 Set HTTP user agent to git/GIT_VERSION
25366 Paul Mackerras (5):
25367 gitk: Use the new --boundary flag to git-rev-list
25368 gitk: Show diffs for boundary commits
25369 gitk: Prevent parent link from overwriting commit headline
25370 gitk: Allow top panes to scroll horizontally with mouse button 2
25371 gitk: Better workaround for arrows on diagonal line segments
25374 Use blob_, commit_, tag_, and tree_type throughout.
25375 Replace xmalloc+memset(0) with xcalloc.
25378 Remove useless pointer update
25379 Fix sparse warnings about usage of 0 instead of NULL
25380 Fix sparse warnings about non-ANSI function prototypes
25383 Make git-clone to take long double-dashed origin option (--origin)
25384 git-clone: exit early if repo isn't specified
25387 Version v1.3.0-rc1; changes since v1.2.6:
25388 -----------------------------------------
25391 PATCH: simplify calls to git programs in git-fmt-merge-msg
25392 workaround fat/ntfs deficiencies for t3600-rm.sh (git-rm)
25394 Alexandre Julliard (12):
25395 Add an Emacs interface in contrib.
25396 git-format-patch: Always add a blank line between headers and body.
25397 contrib/emacs: Add an Emacs VC backend.
25398 git.el: Portability fixes for XEmacs and Emacs CVS.
25399 git.el: Set default directory before running the status mode setup hooks.
25400 git.el: Automatically update .gitignore status.
25401 git.el: Added support for Signed-off-by.
25402 git.el: Added customize support for all parameters.
25403 ls-files: Don't require exclude files to end with a newline.
25404 git.el: More robust handling of subprocess errors when returning strings.
25405 git.el: Get the default user name and email from the repository config.
25406 git.el: Added a function to diff against the other heads in a merge.
25409 git-svnimport: if a limit is specified, respect it
25411 Aneesh Kumar K.V (16):
25412 Add contrib/gitview from Aneesh.
25413 Add a README for gitview
25415 gitview: Read tag and branch information using git ls-remote
25416 gitview: Use monospace font to draw the branch and tag name
25417 gitview: Display the lines joining commit nodes clearly.
25418 gitview: Fix DeprecationWarning
25419 gitview: Bump the rev
25420 gitview: Code cleanup
25421 gitview: Fix the graph display .
25422 gitview: Fix the encoding related bug
25423 gitview: Remove trailing white space
25424 gitview: Some window layout changes.
25425 gitview: Set the default width of graph cell
25426 gitview: Use horizontal scroll bar in the tree view
25427 gitview: pass the missing argument _show_clicked_cb.
25430 git-rebase: Clarify usage statement and copy it into the actual documentation.
25431 New test to verify that when git-clone fails it cleans up the new directory.
25432 git-ls-files: Fix, document, and add test for --error-unmatch option.
25433 Add new git-rm command with documentation
25434 git-rm: Fix to properly handle files with spaces, tabs, newlines, etc.
25436 Dmitry V. Levin (1):
25437 git/Documentation: fix SYNOPSIS style bugs
25440 Introducing contrib/git-svn.
25441 git-svn: fix revision order when XML::Simple is not loaded
25442 git-svn: ensure fetch always works chronologically.
25443 git-svn: remove files from the index before adding/updating
25444 git-svn: fix a typo in defining the --no-stop-on-copy option
25445 git-svn: allow --find-copies-harder and -l<num> to be passed on commit
25446 git-svn: Allow for more argument types for commit (from..to)
25447 git-svn: remove any need for the XML::Simple dependency
25448 git-svn: change ; to && in addremove()
25449 contrib/git-svn.txt: add a note about renamed/copied directory support
25450 git-svn: fix several corner-case and rare bugs with 'commit'
25451 contrib/git-svn: add Makefile, test, and associated ignores
25452 git-svn: 0.9.1: add --version and copyright/license (GPL v2+) information
25453 contrib/git-svn: add show-ignore command
25454 contrib/git-svn: optimize sequential commits to svn
25455 contrib/git-svn: version 0.10.0
25456 contrib/git-svn: tell the user to not modify git-svn-HEAD directly
25457 contrib/git-svn: correct commit example in manpage
25458 contrib/git-svn: use refs/remotes/git-svn instead of git-svn-HEAD
25459 git-branch: add -r switch to list refs/remotes/*
25460 contrib/git-svn: add -b/--branch switch for branch detection
25461 contrib/git-svn: several small bug fixes and changes
25462 contrib/git-svn: strip 'git-svn-id:' when commiting to SVN
25463 contrib/git-svn: allow --authors-file to be specified
25464 contrib/git-svn: cleanup option parsing
25465 contrib/git-svn: create a more recent master if one does not exist
25466 contrib/git-svn: avoid re-reading the repository uuid, it never changes
25467 contrib/git-svn: add --id/-i=$GIT_SVN_ID command-line switch
25468 contrib/git-svn: better documenting of CLI switches
25469 send-email: accept --no-signed-off-by-cc as the documentation states
25470 contrib/git-svn: fix a copied-tree bug in an overzealous assertion
25471 contrib/git-svn: fix svn compat and fetch args
25472 contrib/git-svn: remove the --no-stop-on-copy flag
25473 contrib/git-svn: fix a harmless warning on rebuild (with old repos)
25474 fetch,parse-remote,fmt-merge-msg: refs/remotes/* support
25475 ls-tree: add --abbrev[=<n>] option
25476 ls-files: add --abbrev[=<n>] option
25477 contrib/git-svn: allow rebuild to work on non-linear remote heads
25478 send-email: use built-in time() instead of /bin/date '+%s'
25479 send-email: Change from Mail::Sendmail to Net::SMTP
25480 send-email: try to order messages in email clients more correctly
25481 send-email: lazy-load Email::Valid and make it optional
25482 contrib/git-svn: stabilize memory usage for big fetches
25484 Fernando J. Pereda (1):
25485 Allow building Git in systems without iconv
25488 AsciiDoc fix for tutorial
25489 Tweak asciidoc output to work with broken docbook-xsl
25490 Fix multi-paragraph list items in OPTIONS section
25491 Format tweaks for asciidoc.
25493 Fredrik Kuivinen (13):
25494 Add git-blame, a tool for assigning blame.
25496 git-blame: Make the output human readable
25497 git-blame: Use the same tests for git-blame as for git-annotate
25498 Fix some inconsistencies in the docs
25499 Remove trailing dot after short description
25500 Nicer output from 'git'
25501 Make it possible to not clobber object.util in sort_in_topological_order (take 2)
25502 rev-lib: Make it easy to do rename tracking (take 2)
25503 blame: Rename detection (take 2)
25504 blame: Nicer output
25505 blame: Fix git-blame <directory>
25506 Makefile: Add TAGS and tags targets
25508 J. Bruce Fields (1):
25509 Document git-rebase behavior on conflicts.
25512 Fix typo in git-rebase.sh.
25514 Jeff Muizelaar (2):
25515 cosmetics: change from 'See-Also' to 'See Also'
25516 documentation: add 'see also' sections to git-rm and git-add
25518 Johannes Schindelin (13):
25520 Optionally support old diffs
25522 Optionally work without python
25523 Fixes for ancient versions of GNU make
25524 avoid makefile override warning
25525 Really honour NO_PYTHON
25527 Use Ryan's git-annotate instead of jsannotate
25528 Warn about invalid refs
25529 Fix test case for some sed
25530 imap-send: Add missing #include for macosx
25531 Remove dependency on a file named "-lz"
25534 Add git-show reference
25535 Call out the two different uses of git-branch and fix a typo.
25536 Document the default source of template files.
25537 Clarify git-rebase example commands.
25538 Reference git-commit-tree for env vars.
25540 Rewrite synopsis to clarify the two primary uses of git-checkout.
25541 Clarify and expand some hook documentation.
25542 Removed bogus "<snap>" identifier.
25545 manpages: insert two missing [verse] markers for multi-line SYNOPSIS
25546 repo-config: give value_ a sane default so regexec won't segfault
25548 Josef Weidendorfer (1):
25549 git-mv: fix moves into a subdir from outside
25551 Junio C Hamano (137):
25552 "Assume unchanged" git
25553 "Assume unchanged" git: do not set CE_VALID with --refresh
25554 ls-files: debugging aid for CE_VALID changes.
25555 "Assume unchanged" git: --really-refresh fix.
25556 ls-files: split "show-valid-bit" into a different option.
25557 "assume unchanged" git: documentation.
25558 cache_name_compare() compares name and stage, nothing else.
25559 git-commit: Now --only semantics is the default.
25560 rebase: allow a hook to refuse rebasing.
25561 commit: detect misspelled pathspec while making a partial commit.
25562 rebase: allow rebasing onto different base.
25563 ls-files --error-unmatch pathspec error reporting fix.
25564 Detect misspelled pathspec to git-add
25565 packed objects: minor cleanup
25566 topo-order: make --date-order optional.
25567 pack-objects: reuse data from existing packs.
25568 pack-objects: finishing touches.
25569 git-repack: allow passing a couple of flags to pack-objects.
25570 git-tag: -l to list tags (usability).
25571 Add contrib/README.
25572 SubmittingPatches: note on whitespaces
25573 pack-objects: avoid delta chains that are too long.
25574 Make "empty ident" error message a bit more helpful.
25575 Delay "empty ident" errors until they really matter.
25576 Keep Porcelainish from failing by broken ident after making changes.
25577 fmt-merge-msg: say which branch things were merged into unless 'master'
25578 Allow git-mv to accept ./ in paths.
25579 Documentation: fix typo in rev-parse --short option description.
25580 fmt-merge-msg: do not add excess newline at the end.
25581 rev-list --objects-edge
25582 Thin pack - create packfile with missing delta base.
25583 send-pack --thin: use "thin pack" delta transfer.
25584 Add git-push --thin.
25585 Use thin pack transfer in "git fetch".
25586 fmt-merge-msg: avoid open "-|" list form for Perl 5.6
25587 rerere: avoid open "-|" list form for Perl 5.6
25588 send-email: avoid open "-|" list form for Perl 5.6
25589 svnimport: avoid open "-|" list form for Perl 5.6
25590 cvsimport: avoid open "-|" list form for Perl 5.6
25591 Fix fmt-merge-msg counting.
25592 cherry-pick/revert: error-help message rewording.
25593 git-mktree: reverse of git-ls-tree.
25594 rev-list.c: fix non-grammatical comments.
25595 send-pack: do not give up when remote has insanely large number of refs.
25596 gitview: ls-remote invocation shellquote safety.
25597 pack-objects: thin pack micro-optimization.
25598 pack-objects: use full pathname to help hashing with "thin" pack.
25599 count-delta: tweak counting of copied source material.
25600 count-delta: fix counting of copied source.
25601 Tweak break/merge score to adjust to the new delta generation code.
25602 pack-objects: allow "thin" packs to exceed depth limits
25603 rev-list --objects-edge: remove duplicated edge commit output.
25604 rev-list --objects: use full pathname to help hashing.
25605 pack-objects: hash basename and direname a bit differently.
25606 Revert "diff-delta: produce optimal pack data"
25607 Build and install git-mailinfo.
25608 rev-list split: minimum fixup.
25609 apply --whitespace fixes and enhancements.
25610 apply: squelch excessive errors and --whitespace=error-all
25611 apply --whitespace: configuration option.
25612 git-apply --whitespace=nowarn
25613 Revert "Revert "diff-delta: produce optimal pack data""
25614 git-apply: war on whitespace -- finishing touches.
25615 diffcore-break: micro-optimize by avoiding delta between identical files.
25616 diffcore-rename: split out the delta counting code.
25617 diffcore-delta: stop using deltifier for packing.
25618 git-am: --whitespace=x option.
25619 diff-delta: cull collided hash bucket more aggressively.
25620 git-log (internal): add approxidate.
25621 git-log (internal): more options.
25622 Pretty-print tagger dates.
25623 war on whitespaces: documentation.
25624 Documentation: read-tree --aggressive
25625 Documentation: rev-list --objects-edge
25626 annotate: resurrect raw timestamps.
25627 setup_revisions(): handle -n<n> and -<n> internally.
25628 GIT-VERSION-GEN: squelch unneeded error from "cat version"
25629 show-branch --topics
25631 git-commit: make sure we protect against races.
25632 diffcore-rename: similarity estimator fix.
25633 show-branch --topics: omit more uninteresting commits.
25634 count-delta: no need for this anymore.
25635 diffcore-break: similarity estimator fix.
25636 diffcore-delta: make change counter to byte oriented again.
25637 git-commit --amend: allow empty commit.
25639 verify-pack -v: show delta-chain histogram.
25640 blame: avoid -lm by not using log().
25641 blame and annotate: show localtime with timezone.
25642 blame: avoid "diff -u0".
25643 annotate/blame tests updates.
25644 annotate-blame test: don't "source", but say "."
25645 annotate-blame test: add evil merge.
25646 blame: unbreak "diff -U 0".
25647 annotate-blame: tests incomplete lines.
25648 pack-objects: simplify "thin" pack.
25649 Use #define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))
25650 refs.c::do_for_each_ref(): Finish error message lines with "\n"
25651 fsck-objects: Remove --standalone
25652 Fix t1200 test for breakage caused by removal of full-stop at the end of fast-forward message.
25653 try_to_simplify_commit(): do not skip inspecting tree change at boundary.
25654 repack: prune loose objects when -d is given
25655 git-diff: -p disables rename detection.
25656 diffcore-rename: somewhat optimized.
25657 revision traversal: --remove-empty fix.
25658 revision traversal: --remove-empty fix (take #2).
25659 diffcore-delta: make the hash a bit denser.
25660 diffcore-delta: tweak hashbase value.
25661 cvsimport: honor -i and non -i upon subsequent imports
25662 fetch: exit non-zero when fast-forward check fails.
25663 cvsimport: fix reading from rev-parse
25664 git-pull: run repo-config with dash form.
25665 unpack_delta_entry(): reduce memory footprint.
25666 generate-cmdlist: style cleanups.
25668 git-merge knows some strategies want to skip trivial merges
25669 http-fetch: nicer warning for a server with unreliable 404 status
25670 core.warnambiguousrefs: warns when "name" is used and both "name" branch and tag exists.
25671 revamp git-clone (take #2).
25672 get_sha1_basic(): try refs/... and finally refs/remotes/$foo/HEAD
25673 clone: record the remote primary branch with remotes/$origin/HEAD
25674 http-push.c: squelch C90 warnings.
25675 git-apply: do not barf when updating an originally empty file.
25676 rev-list --timestamp
25677 git-clone: typofix.
25678 git-pull: further safety while on tracking branch.
25679 git-pull: reword "impossible to fast-forward" message.
25680 sha1_name: warning ambiguous refs.
25681 sha1_name: make core.warnambiguousrefs the default.
25682 send-email: Identify author at the top when sending e-mail
25683 commit-tree: check return value from write_sha1_file()
25684 built-in diff: minimum tweaks
25685 true built-in diff: run everything in-core.
25686 git-push: make --thin pack transfer the default.
25687 add clean and ignore rules for xdiff/
25690 Karl Hasselström (7):
25691 git-svnimport: -r adds svn revision number to commit messages
25692 svnimport: Mention -r in usage summary
25693 svnimport: Convert executable flag
25694 svnimport: Convert the svn:ignore property
25695 svnimport: Read author names and emails from a file
25696 Let git-svnimport's author file use same syntax as git-cvsimport's
25697 Save username -> Full Name <email@addr.es> map file
25699 Linus Torvalds (21):
25700 Handling large files with GIT
25701 Handling large files with GIT
25702 git-merge-tree: generalize the "traverse <n> trees in sync" functionality
25703 Teach the "git" command to handle some commands internally
25704 First cut at libifying revlist generation
25705 Make git diff-generation use a simpler spawn-like interface
25706 The war on trailing whitespace
25707 Splitting rev-list into revisions lib, end of beginning.
25708 git-rev-list libification: rev-list walking
25709 Introduce trivial new pager.c helper infrastructure
25710 Tie it all together: "git log"
25711 Rip out merge-order and make "git log <paths>..." work again.
25712 get_revision(): do not dig deeper when we know we are at the end.
25713 git-fmt-merge-msg cleanup
25714 Fix up diffcore-rename scoring
25715 diffcore-delta: 64-byte-or-EOL ultrafast replacement.
25716 diffcore-delta: 64-byte-or-EOL ultrafast replacement (hash fix).
25717 git-apply: safety fixes
25718 Use a *real* built-in diff generator
25719 builtin-diff: \No newline at end of file.
25720 Fix error handling for nonexistent names
25722 Lukas Sandström (1):
25723 git-fetch: print the new and old ref when fast-forwarding
25725 Marco Costalba (1):
25726 Add a Documentation/git-tools.txt
25729 imap-send: cleanup execl() call to use NULL sentinel instead of 0
25732 Let merge set the default strategy.
25735 combine-diff: Honour --full-index.
25736 combine-diff: Honour -z option correctly.
25737 Documentation/Makefile: Some `git-*.txt' files aren't manpages.
25738 gitignore: Ignore some more boring things.
25739 contrib/emacs/Makefile: Provide tool for byte-compiling files.
25740 annotate-tests: override VISUAL when running tests.
25742 Martin Langhoff (18):
25743 Introducing git-cvsserver -- a CVS emulator for git.
25744 cvsserver: add notes on how to get a checkout under Eclipse
25745 cvsserver: Eclipse compat fixes - implement Questionable, alias rlog, add a space after the U
25746 cvsserver: Eclipse compat - browsing 'modules' (heads in our case) works
25747 cvsserver: add notes on how to get a checkout under Eclipse
25748 cvsserver: Eclipse compat fixes - implement Questionable, alias rlog, add a space after the U
25749 cvsserver: Eclipse compat - browsing 'modules' (heads in our case) works
25750 cvsserver: Checkout correctly on Eclipse
25751 annotate: fix -S parameter to take a string
25752 cvsserver: Eclipse compat -- now "compare with latest from HEAD" works
25753 cvsserver: checkout faster by sending files in a sensible order
25754 cvsserver: fix checkouts with -d <somedir>
25755 cvsserver: checkout faster by sending files in a sensible order
25756 cvsserver: fix checkouts with -d <somedir>
25757 cvsserver: nested directory creation fixups for Eclipse clients
25758 cvsserver: better error messages
25759 cvsserver: anonymous cvs via pserver support
25760 cvsserver: updated documentation
25763 gitk: Make error_popup react to Return
25765 Matthias Urlichs (2):
25766 cvsimport: Remove master-updating code
25767 Don't recurse into parents marked uninteresting.
25769 Mike McCormack (5):
25770 Allow adding arbitary lines in the mail header generated by format-patch.
25771 Allow format-patch to attach patches
25772 Document the --attach flag.
25773 Describe how to add extra mail header lines in mail generated by git-format-patch.
25774 Add git-imap-send, derived from isync 1.0.1.
25776 Nick Hengeveld (10):
25777 Update http-push functionality
25778 http-push: fix revision walk
25779 HTTP slot reuse fixes
25780 http-push: refactor remote file/directory processing
25781 http-push: improve remote lock management
25782 http-push: support for updating remote info/refs
25784 Fix broken slot reuse when fetching alternates
25785 http-push: add support for deleting remote branches
25786 http-push: don't assume char is signed
25788 Nicolas Pitre (11):
25789 relax delta selection filtering in pack-objects
25790 diff-delta: fold two special tests into one plus cleanups
25791 diff-delta: produce optimal pack data
25792 diff-delta: big code simplification
25793 diff-delta: bound hash list length to avoid O(m*n) behavior
25794 diff-delta: produce optimal pack data
25795 diff-delta: bound hash list length to avoid O(m*n) behavior
25796 diff-delta: allow reusing of the reference buffer index
25797 test-delta needs zlib to compile
25798 diff-delta: bound hash list length to avoid O(m*n) behavior
25799 3% tighter packs for free
25802 allow double click on current HEAD id after git-pull
25805 Makefile tweaks: Solaris 9+ dont need iconv / move up uname variables
25807 Paul Mackerras (13):
25808 gitk: Make "find" on "Files" work again.
25809 gitk: New improved gitk
25810 gitk: Fix clicks on arrows on line ends
25811 gitk: Fix Update menu item
25812 gitk: Various speed improvements
25813 gitk: Further speedups
25814 gitk: Fix a bug in drawing the selected line as a thick line
25815 gitk: Fix display of diff lines beginning with --- or +++
25816 gitk: Make commitdata an array rather than a list
25817 gitk: Don't change cursor at end of layout if find in progress
25818 gitk: Make downward-pointing arrows end in vertical line segment
25819 gitk: Improve appearance of first child links
25820 gitk: Fix two bugs reported by users
25823 gitview: Select the text color based on whether the entry in highlighted. Use standard font.
25826 Properly git-bisect reset after bisecting from non-master head
25827 Optionally do not list empty directories in git-ls-files --others
25829 Randal L. Schwartz (1):
25830 fix imap-send for OSX
25833 tar-tree: Use SHA1 of root tree for the basedir
25834 tar-tree: Introduce write_entry()
25835 tar-tree: Use write_entry() to write the archive contents
25836 tar-tree: Remove obsolete code
25837 tar-tree: Use the prefix field of a tar header
25840 send-email: Add some options for controlling how addresses are automatically added to the cc: list.
25841 send-email: Add --cc
25842 Add git-annotate, a tool for assigning blame.
25843 annotate: Handle dirty state and arbitrary revisions.
25844 annotate: Convert all -| calls to use a helper open_pipe().
25845 annotate: Use qx{} for pipes on activestate.
25846 annotate: handle \No newline at end of file.
25847 annotate: Add a basic set of test cases.
25848 annotate: Support annotation of files on other revisions.
25850 Sean Estabrooks (1):
25851 annotate.perl triggers rpm bug
25853 Shawn O. Pearce (7):
25854 git ls files recursively show ignored files
25855 Add missing programs to ignore list
25856 Darwin: Ignore missing /sw/lib
25857 Teach git-checkout-index to read filenames from stdin.
25858 Prevent --index-info from ignoring -z.
25859 Add --temp and --stage=all options to checkout-index.
25860 Add missing semicolon to sed command.
25863 Use setenv(), fix warnings
25866 fix warning from pack-objects.c
25867 Re-fix compilation warnings.
25868 annotate should number lines starting with 1
25869 fix field width/precision warnings in blame.c
25872 Be verbose when !initial commit
25875 Version v1.2.6; changes since v1.2.5:
25876 -------------------------------------
25878 Junio C Hamano (3):
25879 parse_date(): fix parsing 03/10/2006
25880 diff_flush(): leakfix.
25881 count-delta: match get_delta_hdr_size() changes.
25884 check patch_delta bounds more carefully
25887 Version v1.2.5; changes since v1.2.4:
25888 -------------------------------------
25891 Use sigaction and SA_RESTART in read-tree.c; add option in Makefile.
25893 Junio C Hamano (3):
25894 read-tree --aggressive: remove deleted entry from the working tree.
25895 tar-tree: file/dirmode fix.
25896 safe_fgets() - even more anal fgets()
25898 Linus Torvalds (2):
25899 Fix Solaris stdio signal handling stupidities
25900 pack-objects: be incredibly anal about stdio semantics
25903 Version v1.2.4; changes since v1.2.3:
25904 -------------------------------------
25907 fix t5600-clone-fail-cleanup.sh on windows
25909 Josef Weidendorfer (2):
25910 git-mv: Allow -h without repo & fix error message
25911 git-mv: fixes for path handling
25913 Junio C Hamano (13):
25914 checkout - eye candy.
25915 Give no terminating LF to error() function.
25916 diffcore-rename: plug memory leak.
25917 git-am: do not allow empty commits by mistake.
25918 sample hooks template.
25919 apply --whitespace fixes and enhancements.
25920 apply: squelch excessive errors and --whitespace=error-all
25921 apply --whitespace: configuration option.
25922 git-apply --whitespace=nowarn
25923 git-apply: war on whitespace -- finishing touches.
25924 git-am: --whitespace=x option.
25925 diffcore-break: micro-optimize by avoiding delta between identical files.
25926 Allow git-mv to accept ./ in paths.
25928 Linus Torvalds (1):
25929 The war on trailing whitespace
25932 combine-diff: Honour --full-index.
25933 combine-diff: Honour -z option correctly.
25936 Version v1.2.3; changes since v1.2.2:
25937 -------------------------------------
25940 git-add: Add support for --, documentation, and test.
25941 git-push: Update documentation to describe the no-refspec behavior.
25943 Junio C Hamano (11):
25944 format-patch: pretty-print timestamp correctly.
25945 detect broken alternates.
25946 pack-objects: reuse data from existing packs.
25947 pack-objects: finishing touches.
25948 git-repack: allow passing a couple of flags to pack-objects.
25949 pack-objects: avoid delta chains that are too long.
25950 Make "empty ident" error message a bit more helpful.
25951 Delay "empty ident" errors until they really matter.
25952 Keep Porcelainish from failing by broken ident after making changes.
25953 pack-objects eye-candy: finishing touches.
25954 git-fetch: follow tag only when tracking remote branch.
25957 nicer eye candies for pack-objects
25958 also adds progress when actually writing a pack
25961 Version v1.2.2; changes since v1.2.1:
25962 -------------------------------------
25965 Trap exit to clean up created directory if clone fails.
25966 Abstract test_create_repo out for use in tests.
25967 Prevent git-upload-pack segfault if object cannot be found
25970 archimport: remove files from the index before adding/updating
25973 git-rev-parse: Fix --short= option parsing
25974 Document --short and --git-dir in git-rev-parse(1)
25977 Fix retries in git-cvsimport
25979 Shawn O. Pearce (1):
25980 Make git-reset delete empty directories
25983 Version v1.2.1; changes since v1.2.0:
25984 -------------------------------------
25986 Fernando J. Pereda (1):
25987 Print an error if cloning a http repo and NO_CURL is set
25989 Fredrik Kuivinen (1):
25990 s/SHELL/SHELL_PATH/ in Makefile
25992 Josef Weidendorfer (1):
25993 More useful/hinting error messages in git-checkout
25995 Junio C Hamano (6):
25996 Documentation: git-commit in 1.2.X series defaults to --include.
25997 Documentation: git-ls-files asciidocco.
25998 bisect: remove BISECT_NAMES after done.
25999 combine-diff: diff-files fix.
26000 combine-diff: diff-files fix (#2)
26001 checkout: fix dirty-file display.
26004 Version v1.2.0; changes since v1.1.6:
26005 -------------------------------------
26008 Add freebsd support in Makefile
26011 fix "test: 2: unexpected operator" on bsd
26012 avoid echo -e, there are systems where it does not work
26014 Andreas Ericsson (4):
26015 git-cvsimport: Add -A <author-conv-file> option
26016 update-hook: Major overhaul (handling tags, mainly).
26017 format-patch: Remove last vestiges of --mbox option
26018 .gitignore git-rerere and config.mak
26020 Christian Biesinger (1):
26021 Use a relative path for SVN importing
26023 Daniel Barkalow (4):
26024 Only use a single parser for tree objects
26025 Use struct tree in tar-tree
26026 Use struct commit in tar-tree
26027 Make apply accept the -pNUM option like patch does.
26029 Eric W. Biederman (1):
26030 Fix git-format-patch -s to include a Signed-off-by: line...
26033 rev-list: allow -n<n> as shorthand for --max-count=<n>
26034 rev-list: allow -<n> as shorthand for --max-count=<n>
26036 Florian Weimer (1):
26037 AsciiDoc fixes for the git-svnimport manpage
26039 Fredrik Kuivinen (2):
26040 merge-recursive: Make use of provided bases
26041 merge-recursive: Speed up commit graph construction
26043 J. Bruce Fields (7):
26044 Minor git-reset and git-commit documentation fixes
26045 Mention install-doc in INSTALL
26047 cvs-migration documentation update
26048 Docs: split up pull-fetch-param.txt
26049 Docs: move git url and remotes text to separate sections
26050 Docs: minor git-push copyediting
26053 Run GIT-VERSION-GEN with $(SHELL), not sh.
26054 Add compat/unsetenv.c .
26055 Use sha1_file.c's mkdir-like routine in apply.c.
26056 stat() for existence in safe_create_leading_directories()
26058 Johannes Schindelin (1):
26059 Use a hashtable for objects instead of a sorted list
26062 Add --diff-filter= documentation paragraph
26064 Junio C Hamano (112):
26065 show-branch: take default arguments from configuration file.
26066 git-describe: default to HEAD
26067 Makefile: add 'strip' target
26068 octopus: allow criss-cross and clarify the message when it rejects
26069 Fix the installation location.
26070 checkout: automerge local changes while switching branches.
26071 checkout: merge local modifications while switching branches.
26072 git-push: avoid falling back on pushing "matching" refs.
26073 checkout: show dirty state upon switching branches.
26074 clone: --naked option.
26075 format-patch: always --mbox and show sane Date:
26076 octopus: allow manual resolve on the last round.
26077 Documentation: show-branch.
26078 show-branch: make the current branch and merge commits stand out.
26079 show-branch: --current includes the current branch.
26080 cvsimport: ease migration from CVSROOT/users format
26081 git-push: fix --tags and document it.
26082 Allow building of RPM from interim snapshot.
26083 Revert "git-push: avoid falling back on pushing "matching" refs."
26084 Makefile: do not assume lack of IPV6 means no sockaddr_storage.
26085 fsck-objects: support platforms without d_ino in struct dirent.
26086 DT_UNKNOWN: do not fully trust existence of DT_UNKNOWN
26087 t4011: "sleep 1" is not enough on FAT
26088 Undef DT_* before redefining them.
26089 git-grep: clarification on parameters.
26090 Recommend to remove unused `origin` in a shared repository.
26091 Documentation: finishing touches to the new tutorial.
26092 sample update-hook: sanely handle a new branch head.
26093 git-clone: PG13 --naked option to --bare.
26094 clone: do not create remotes/origin nor origin branch in a bare repository.
26095 clone: do not accept more than one -o option.
26096 tests: adjust breakage by stricter rev-parse
26097 git-fetch --upload-pack: disambiguate.
26098 merge: seed the commit message with list of conflicted files.
26099 diff-tree -c: show a merge commit a bit more sensibly.
26100 diff-tree --cc: denser combined diff output for a merge commit.
26101 combine-diff: fix appending at the tail of a list.
26102 combine-diff: minor output changes.
26103 combine-diff: extend --cc logic to Octopus.
26104 diff-tree --cc: squelch header generation on empty patch.
26105 combine-diff: better hunk splitting.
26106 diff-files: -c and --cc options.
26107 rev-list --remove-empty: add minimum help and doc entry.
26108 abbrev cleanup: use symbolic constants
26109 rev-parse: --abbrev option.
26110 diff-tree: abbreviate merge parent object names with --abbrev --pretty.
26111 rev-parse --abbrev: do not try abbrev shorter than minimum.
26112 Rename rev-parse --abbrev to --short.
26113 pretty_print_commit(): pass commit object instead of commit->buffer.
26114 pretty_print_commit: honor grafts.
26115 diff --abbrev=<n> option fix.
26116 rev-parse: make "whatchanged -- git-fetch-script" work again.
26117 diff-files -c/--cc: combine only when both ours and theirs exist.
26118 Documentation: diff -c/--cc
26119 documentation: cvs migration - typofix.
26120 update-index --index-info: allow stage 0 entries.
26121 rev-list: omit duplicated parents.
26122 combine-diff: reuse diff from the same blob.
26123 combine-diff: update --cc "uninteresting hunks" logic.
26124 combine-diff: add safety check to --cc.
26125 combine-diff: fix placement of deletion.
26126 Documentation: git-diff-tree --cc also omits empty commits
26127 commit.c: "Merge" fix in pretty_print_commit.
26128 combine-diff: add a bit more comments.
26129 combine-diff: show parent line numbers as well.
26130 combine-diff: cleanup.
26131 combine-diff: finishing touches to git-diff-tree --cc
26132 whitespace cleanup.
26133 get_sha1_1: allow octopus^12 to be properly parsed.
26134 git-merge: Properly quote $merge_msg variable.
26135 Do not fall back on vi on dumb terminals.
26136 diff-index: make --cc a synonym for -p for now.
26137 git-diff: use --cc instead of -p.
26139 daemon: do not forbid user relative paths unconditionally under --base-path
26140 daemon: extend user-relative path notation.
26141 combine-diff: remove misguided --show-empty hack.
26142 git-diff-tree --stdin: show all parents.
26143 git-diff: do not fall back on --cc when -[123], --ours etc. are given.
26144 core-tutorial: adjust to recent reality.
26145 combine-diff: do not send NULL to printf
26146 combine-diff: show mode changes as well.
26147 combine-diff: do not punt on removed or added files.
26148 mailinfo: reset CTE after each multipart
26149 read-tree --aggressive
26150 fmt-merge-msg: show summary of what is merged.
26151 git-rerere: reuse recorded resolve.
26152 git-commit: revamp the git-commit semantics.
26153 git-commit: finishing touches.
26154 Do not allow empty name or email.
26155 t6000: fix a careless test library add-on.
26156 ls-files: honour per-directory ignore file from higher directories.
26157 combined-diff: use diffcore before intersecting paths.
26158 call git_config() after setup_git_directory()
26159 combine-diff: move formatting logic to show_combined_diff()
26160 count-delta.c: Match the delta data semantics change in version 3.
26162 find_unique_abbrev() simplification.
26163 combine-diff: Record diff status a bit more faithfully
26164 rev-list: default to abbreviate merge parent names under --pretty.
26165 git-commit -v: have patch at the end.
26166 Define GIT_(AUTHOR|COMMITTER)_(NAME|EMAIL) to known values.
26167 fetch-clone progress: finishing touches.
26168 Only call git-rerere if $GIT_DIR/rr-cache exists.
26169 t5500: adjust to change in pack-object reporting behaviour.
26170 diff-tree: do not default to -c
26171 Avoid using "git-var -l" until it gets fixed.
26172 hashtable-based objects: minimum fixups.
26173 Make pack-objects chattier.
26174 git-commit: show dirtiness including index.
26175 Fix "test: unexpected operator" on bsd
26179 Add howto about separating topics.
26181 Linus Torvalds (14):
26182 Make git-rev-list and git-rev-parse argument parsing stricter
26183 git-whatchanged: exit out early on errors
26184 rev-list: stop when the file disappears
26185 Make the "struct tree_desc" operations available to others
26186 Make git-tar-tree use the tree_desc abstractions
26187 Fix git-rev-parse over-eager errors
26188 diff-tree --always flag
26189 rev-parse lstat() workaround cleanup.
26190 Fix "git diff a..b" breakage
26191 diff-tree -c raw output
26192 Make "git clone" less of a deathly quiet experience
26193 Make "git clone" pack-fetching download statistics better
26194 Fix fetch-clone in the presense of signals
26195 Fix object re-hashing
26198 daemon: Provide missing argument for logerror() call.
26199 http-fetch: Fix object list corruption in fill_active_slots().
26200 http-fetch: Fix message reporting rename of object file.
26201 http: Turn on verbose Curl messages if GIT_CURL_VERBOSE set in environment
26202 http-fetch: Tidy control flow in process_alternate_response
26203 daemon: Set SO_REUSEADDR on listening sockets.
26204 http-fetch: Abort requests for objects which arrived in packs
26206 Martin Langhoff (3):
26207 cvsimport: Add -S <skipfileregex> support and -v announces files retrieved
26208 exportcommit: replace backticks with safe_pipe_capture() or system() - initial pass
26209 cvsexportcommit: add some examples to the documentation
26212 local push/pull env cleanup
26214 Michal Ostrowski (3):
26215 Exec git programs without using PATH.
26216 git-fetch: pass --upload-pack to fetch-pack
26217 git-{fetch,peek-remote} handling of --upload-pack
26219 Nick Hengeveld (2):
26220 Fix HTTP request result processing after slot reuse
26221 Use local structs for HTTP slot callback data
26224 remove delta-against-self bit
26225 count-delta.c: comment fixes
26226 delta micro optimization
26228 Paul Mackerras (2):
26229 gitk: Add braces around if expressions
26230 gitk: Use git-diff-tree --cc for showing the diffs for merges
26233 Disable USE_SYMLINK_HEAD by default
26234 Don't include ../README in git.txt - make a local copy
26237 Use adler32() from zlib instead of defining our own.
26240 Document git-ls-files --directory
26241 Allow diff and index commands to be interrupted
26242 Document git-diff-tree --always
26243 Basic documentation for git-show
26244 Add support for explicit type specifiers when calling git-repo-config
26247 Provide a more meaningful initial "From " line when using --compose in git-send-email.
26248 git-send-email: Add --quiet to reduce some of the chatter when sending emails.
26249 git-send-email: Fully implement --quiet and document it.
26251 Sasha Khapyorsky (1):
26252 git-svnimport.perl: fix for 'arg list too long...'
26255 Add --keep option to keep downloaded packs to git-fetch.
26258 update using-topic-branches
26260 Uwe Kleine-König (4):
26261 Fix generation of "humanish" part of source repo
26262 Remove unneeded header
26263 Use symbolic name SHORT_NAME_AMBIGUOUS as error return value
26264 Make GIT-VERSION-GEN tolerate missing git describe command again
26267 Version v1.1.6; changes since v1.1.5:
26268 -------------------------------------
26270 Fredrik Kuivinen (2):
26271 merge-recursive: Improve the error message printed when merge(1) isn't found.
26272 git-branch: Documentation fixes
26274 J. Bruce Fields (1):
26275 git push -f documentation
26277 Junio C Hamano (1):
26278 pre-commit sample hook: do not barf on the initial import
26281 Version v1.1.5; changes since v1.1.4:
26282 -------------------------------------
26284 Junio C Hamano (1):
26285 checkout: do not make a temporary copy of symlink target.
26288 Version v1.1.4; changes since v1.1.3:
26289 -------------------------------------
26291 Johannes Schindelin (1):
26292 git-fetch-pack: really do not ask for funny refs
26294 Junio C Hamano (1):
26295 Revert "check_packed_git_idx(): check integrity of the idx file itself."
26298 Version v1.1.3; changes since v1.1.2:
26299 -------------------------------------
26301 Junio C Hamano (2):
26302 diffcore-break/diffcore-rename: integer overflow.
26303 describe: omit clearing marks on the last one.
26306 Version v1.1.2; changes since v1.1.1:
26307 -------------------------------------
26309 J. Bruce Fields (1):
26310 Documentation: clarify fetch parameter descriptions.
26312 Junio C Hamano (6):
26313 update-index: work with c-quoted name
26314 describe: do not silently ignore indescribable commits
26315 name-rev: do not omit leading components of ref name.
26316 show-branch: handle [] globs as well.
26317 Documentation: git-commit -a
26318 Documentation: git-reset - interrupted workflow.
26321 Add git-describe to .gitignore.
26324 Version v1.1.1; changes since v1.1.0:
26325 -------------------------------------
26327 H. Peter Anvin (1):
26328 For release tarballs, include the proper version
26330 Johannes Schindelin (1):
26331 glossary: explain "master" and "origin"
26333 Junio C Hamano (1):
26334 GIT-VERSION-GEN: detect dirty tree and mark the version accordingly.
26337 Version v1.1.0; changes since v1.0.12:
26338 --------------------------------------
26340 Johannes Schindelin (3):
26341 git-clone: Support changing the origin branch with -o
26342 Introduce core.sharedrepository
26343 git-init-db: initialize shared repositories with --shared
26346 Make GIT-VERSION-GEN tolerate missing git describe command
26348 Junio C Hamano (23):
26349 Post 1.0.0 development track.
26350 Versioning scheme changes.
26351 merge-recursive: conflicting rename case.
26352 whatchanged: customize diff-tree output
26353 rev-parse: --show-cdup
26354 check_packed_git_idx(): check integrity of the idx file itself.
26355 checkout: sometimes work from a subdirectory.
26356 ls-tree: chomp leading directories when run from a subdirectory
26357 git-clone: do not special case dumb http.
26358 Tutorial: mention shared repository management.
26359 git-describe: really prefer tags only.
26360 git-describe: use find_unique_abbrev()
26361 git-describe: --tags and --abbrev
26362 git-describe: still prefer annotated tag under --all and --tags
26363 git-describe: documentation.
26364 Makefile: use git-describe to mark the git version.
26365 send-pack/receive-pack: allow errors to be reported back to pusher.
26366 git-fetch: auto-following tags.
26367 ls-files --others --directory: fix a bug with index entry ordering
26368 ls-files --others --directory: give trailing slash
26369 git-status: use ls-files --others --directory for untracked list.
26370 ls-files --others --directory: test
26371 describe: allow more than one revs to be named.
26373 Linus Torvalds (2):
26374 Add a "git-describe" command
26375 ls-files -o: optionally skip showing the contents in "untracked" directories
26377 Lukas Sandström (1):
26378 git-pack-redundant: speed and memory usage improvements
26381 git-daemon --base-path
26383 YOSHIFUJI Hideaki (1):
26384 GIT: Support [address] in URLs
26387 Add an optional limit to git-cherry
26388 Add a minimal test for git-cherry
26389 Add a test for rebase when a change was picked upstream
26392 Version v1.0.12; changes since v1.0.11:
26393 ---------------------------------------
26395 Johannes Schindelin (1):
26396 git-fetch-pack: really do not ask for funny refs
26398 Junio C Hamano (1):
26399 Revert "check_packed_git_idx(): check integrity of the idx file itself."
26402 Version v1.0.11; changes since v1.0.10:
26403 ---------------------------------------
26405 Junio C Hamano (1):
26406 diffcore-break/diffcore-rename: integer overflow.
26409 Version v1.0.10; changes since v1.0.9:
26410 --------------------------------------
26412 J. Bruce Fields (1):
26413 Documentation: clarify fetch parameter descriptions.
26415 Junio C Hamano (5):
26416 update-index: work with c-quoted name
26417 name-rev: do not omit leading components of ref name.
26418 show-branch: handle [] globs as well.
26419 Documentation: git-commit -a
26420 Documentation: git-reset - interrupted workflow.
26423 Version v1.0.9; changes since v1.0.8:
26424 -------------------------------------
26426 Johannes Schindelin (1):
26427 glossary: explain "master" and "origin"
26430 Version v1.0.8; changes since v1.0.7:
26431 -------------------------------------
26434 Substitute "/" with $opt_s in tag names as well as branch names
26436 Junio C Hamano (7):
26437 unpack-objects: default to quiet if stderr is not a tty.
26438 Retire debian/ directory.
26439 prune: do not show error from pack-redundant when no packs are found.
26440 Compilation: zero-length array declaration.
26441 tar-tree: finish honoring extractor's umask in git-tar-tree.
26442 revert/cherry-pick: handle single quote in author name.
26443 mailsplit: allow empty input from stdin
26446 Teach cvsexportcommit to add new files
26447 Fix typo in debug stanza of t2001
26448 Fix git-format-patch usage string wrt output modes.
26451 Version v1.0.7; changes since v1.0.6:
26452 -------------------------------------
26455 trivial: retval of waitpid is not errno
26456 trivial: O_EXCL makes O_TRUNC redundant
26457 fix potential deadlock in create_one_file
26458 use result of open(2) to check for presence
26459 trivial: typo in git-commit.sh
26460 trivial: clarify, what are the config's user.name and user.email about
26461 trivial: remove the dots at the end of file names from merge-one-file
26462 trivial: use git-repo-config to detect if the test can be run on the repository
26463 trivial: use git-repo-config to detect how to run tests in the test repository
26464 trivial: .gitignore precompiled python modules
26465 trivial: check, if t/trash directory was successfully created
26466 use GIT_DIR instead of /var/tmp
26468 Amos Waterland (1):
26469 AIX compile fix for repo-config.c
26471 Andreas Ericsson (1):
26472 git: grok 'help' to mean '--help'.
26475 svnimport: support repositories requiring SSL authentication
26476 Documentation/git-svnimport: document -T and -t switches correctly
26479 Fix skipping merge-order test with NO_OPENSSL=1.
26482 Fix git-symbolic-ref typo in git.txt.
26485 git-init-db(1): Describe --shared and the idempotent nature of init-db
26486 Wrap synopsis lines and use [verse] to keep formatting
26488 Junio C Hamano (6):
26489 Documentation: spell.
26490 code comments: spell
26491 ?alloc: do not return NULL when asked for zero bytes
26492 git-fetch --tags: reject malformed tags.
26493 format-patch/commit: Quote single quote in the author name properly.
26494 t3300: skip when filesystem does not like TAB in filenames.
26496 Linus Torvalds (1):
26497 Fix nasty approxidate bug
26500 Version v1.0.6; changes since v1.0.5:
26501 -------------------------------------
26503 Junio C Hamano (3):
26504 Guard a test against wc that pads its output with whitespace
26505 Fix bogus tests on rev-list output.
26506 Do not mark tags fetched via --tags flag as mergeable
26509 copy_fd: close ifd on error
26512 Version v1.0.5; changes since v1.0.4:
26513 -------------------------------------
26516 short circuit out of a few places where we would allocate zero bytes
26518 Johannes Schindelin (1):
26519 Handle symlinks graciously
26521 Junio C Hamano (2):
26522 avoid asking ?alloc() for zero bytes.
26523 t5300: avoid false failures.
26526 Version v1.0.4; changes since v1.0.3:
26527 -------------------------------------
26529 Junio C Hamano (5):
26530 check_packed_git_idx(): check integrity of the idx file itself.
26531 show-branch: usability updates.
26532 merge --no-commit: tweak message
26533 ls-files --full-name: usage string and documentation.
26534 mailinfo: iconv does not like "latin-1" -- should spell it "latin1"
26537 Version v1.0.3; changes since v1.0.0b:
26538 --------------------------------------
26541 \n usage in stderr output
26543 Johannes Schindelin (2):
26544 git-format-patch should show the correct version
26545 sha1_to_hex: properly terminate the SHA1
26547 Junio C Hamano (1):
26548 send-pack: reword non-fast-forward error message.
26550 Nick Hengeveld (1):
26551 Fix for http-fetch from file:// URLs
26554 sanity check in add_packed_git()
26557 Version v1.0.0b; changes since v1.0.0a:
26558 ---------------------------------------
26560 Junio C Hamano (1):
26561 server-info: skip empty lines.
26564 quote.c: Make loop control more readable.
26567 Version v1.0.0a; changes since v1.0.0:
26568 --------------------------------------
26570 Johannes Schindelin (1):
26571 Avoid misleading success message on error
26573 Junio C Hamano (3):
26574 objects/info/packs: work around bug in http-fetch.c::fetch_indices()
26575 http-fetch.c: fix objects/info/pack parsing.
26579 An off-by-one bug found by valgrind