Commit Graph

  • 92edf61870 branch: error message deleting a branch in use Rubén Justo 2023-08-07 22:42:36 +02:00
  • ff29a61cbb advice: handle "rebase" in error_resolve_conflict() Oswald Buddenhagen 2023-08-07 19:09:35 +02:00
  • 010a0b62e0 t/lib-rebase: set_fake_editor(): handle FAKE_LINES more consistently Oswald Buddenhagen 2023-08-07 19:09:34 +02:00
  • 1cc462446e t/lib-rebase: set_fake_editor(): fix recognition of reset's short command Oswald Buddenhagen 2023-08-07 19:09:33 +02:00
  • a82fb66fed A few more topics before -rc1 Junio C Hamano 2023-08-07 10:18:48 -07:00
  • 1221e94bd0 mailmap: change primary address for Glen Choo Glen Choo 2023-08-07 18:41:50 +00:00
  • b2797581d0 Merge branch 'ew/sha256-gcrypt-leak-fixes' Junio C Hamano 2023-08-07 11:57:18 -07:00
  • a04cef9fd7 Merge branch 'rs/bundle-parseopt-cleanup' Junio C Hamano 2023-08-07 11:57:18 -07:00
  • e48d9c78cc Merge branch 'am/doc-sha256' Junio C Hamano 2023-08-07 11:57:18 -07:00
  • dee27be905 Merge branch 'tb/commit-graph-tests' Junio C Hamano 2023-08-07 11:57:18 -07:00
  • 311c8ff11c parse-options: simplify usage_padding() René Scharfe 2023-08-05 16:52:42 +02:00
  • 2a409a1d12 parse-options: no --[no-]no-... René Scharfe 2023-08-05 16:44:45 +02:00
  • 652a6b15bc parse-options: factor out usage_indent() and usage_padding() René Scharfe 2023-08-05 16:43:04 +02:00
  • e8e5d294dc parse-options: show negatability of options in short help René Scharfe 2023-08-05 16:40:59 +02:00
  • d5dc68f730 t1502: test option negation René Scharfe 2023-08-05 16:39:52 +02:00
  • 8dcb49021e t1502: move optionspec help output to a file René Scharfe 2023-08-05 16:38:56 +02:00
  • aa43619bdf t1502, docs: disallow --no-help René Scharfe 2023-08-05 16:37:55 +02:00
  • d716512870 subtree: disallow --no-{help,quiet,debug,branch,message} René Scharfe 2023-08-05 16:37:40 +02:00
  • e600568929 l10n: po-id for 2.42 (round 1) Bagas Sanjaya 2023-08-06 18:19:52 +07:00
  • 450f2c9e3e Merge branch 'russian-l10n' of https://github.com/DJm00n/git-po-ru Jiang Xin 2023-08-05 23:26:39 +08:00
  • 0e87def282 What's cooking (2023/08 #02) Junio C Hamano 2023-08-04 12:07:20 -07:00
  • a5c01603b3 gitignore: ignore clangd .cache directory brian m. carlson 2023-08-04 17:13:28 +00:00
  • ac83bc5054 Git 2.42-rc0 v2.42.0-rc0 Junio C Hamano 2023-08-04 10:01:45 -07:00
  • 65e25ae522 Merge branch 'jc/branch-in-use-error-message' Junio C Hamano 2023-08-04 10:52:31 -07:00
  • f4a7c24c09 Merge branch 'hy/blame-in-bare-with-contents' Junio C Hamano 2023-08-04 10:52:31 -07:00
  • f9712d75e6 Merge branch 'jc/parse-options-short-help' Junio C Hamano 2023-08-04 10:52:31 -07:00
  • 23b20fff3a Merge branch 'jc/doc-sent-patch-now-what' Junio C Hamano 2023-08-04 10:52:30 -07:00
  • 840affcb8d Merge branch 'la/doc-choose-starting-point-fixup' Junio C Hamano 2023-08-04 10:52:30 -07:00
  • a53e8a6488 Merge branch 'pv/doc-submodule-update-settings' Junio C Hamano 2023-08-04 10:52:30 -07:00
  • 4d06001846 Merge branch 'ja/worktree-orphan-fix' Junio C Hamano 2023-08-04 10:52:30 -07:00
  • 3365e2675e Merge branch 'jc/retire-get-sha1-hex' Junio C Hamano 2023-08-04 10:52:30 -07:00
  • dd68b57fc4 Merge branch 'la/doc-choose-starting-point' Junio C Hamano 2023-08-04 10:52:29 -07:00
  • fff1594fa7 docs: update when git bisect visualize uses gitk Matthias Aßhauer 2023-08-04 04:08:44 +00:00
  • 2bf46a9f62 compat/mingw: implement a native locate_in_PATH() Matthias Aßhauer 2023-08-04 04:08:43 +00:00
  • bb532b5345 run-command: conditionally define locate_in_PATH() Matthias Aßhauer 2023-08-04 04:08:42 +00:00
  • 6ce7afe163 rebase --skip: fix commit message clean up when skipping squash Phillip Wood 2023-08-03 13:09:35 +00:00
  • 1bbcd54e58 What's cooking (2023/08 #01) Junio C Hamano 2023-08-02 10:49:32 -07:00
  • 1c04cb0744 ident: don't consider '.' a crud brian m. carlson 2023-08-02 09:49:32 -07:00
  • 1b0a512956 The eighteenth batch Junio C Hamano 2023-08-02 08:44:02 -07:00
  • 955c2b1c6a Documentation/RelNotes/2.42.0.txt: typofix Taylor Blau 2023-08-01 14:20:18 -04:00
  • 70e5c5dddd Merge branch 'ks/ref-filter-describe' Junio C Hamano 2023-08-02 09:37:24 -07:00
  • 8bfb359844 Merge branch 'ah/sequencer-rewrite-todo-fix' Junio C Hamano 2023-08-02 09:37:23 -07:00
  • 52d9dc20e1 Merge branch 'bb/use-trace2-counters-for-fsync-stats' Junio C Hamano 2023-08-02 09:37:23 -07:00
  • 99acb0fa54 Merge branch 'ah/autoconf-fixes' Junio C Hamano 2023-08-02 09:37:23 -07:00
  • fea92e4cac Merge branch 'jc/tree-walk-drop-base-offset' Junio C Hamano 2023-08-02 09:37:23 -07:00
  • bda9c12073 avoid SHA-1 functions deprecated in OpenSSL 3+ Eric Wong 2023-08-01 02:54:54 +00:00
  • 3e440ea0ab sha256: avoid functions deprecated in OpenSSL 3+ Eric Wong 2023-08-01 02:54:53 +00:00
  • 5bdedac3c7 checkout: allow "checkout -m path" to unmerge removed paths Junio C Hamano 2023-07-31 15:44:09 -07:00
  • ed3789f2f0 checkout/restore: add basic tests for --merge Junio C Hamano 2023-07-31 15:44:08 -07:00
  • 54f98fee50 checkout/restore: refuse unmerging paths unless checking out of the index Junio C Hamano 2023-07-31 15:44:07 -07:00
  • c0a4ae7f4e update-index: remove stale fallback code for "--unresolve" Junio C Hamano 2023-07-31 15:44:06 -07:00
  • 35901f1c24 update-index: use unmerge_index_entry() to support removal Junio C Hamano 2023-07-31 15:44:05 -07:00
  • fe83269e16 resolve-undo: allow resurrecting conflicted state that resolved to deletion Junio C Hamano 2023-07-31 15:44:04 -07:00
  • 91e07058c5 update-index: do not read HEAD and MERGE_HEAD unconditionally Junio C Hamano 2023-07-31 15:44:03 -07:00
  • 93a884b351 What's cooking (2023/07 #07) Junio C Hamano 2023-07-31 10:02:36 -07:00
  • 8e42eb0e9a doc: sha256 is no longer experimental Adam Majer 2023-07-31 15:42:02 +02:00
  • 823839bda1 sha256/gcrypt: die on gcry_md_open failures Eric Wong 2023-07-31 12:08:08 +00:00
  • 8b608f3fb8 sha256/gcrypt: fix memory leak with SHA-256 repos Eric Wong 2023-07-31 12:08:07 +00:00
  • b4b85e41a7 sha256/gcrypt: fix build with SANITIZE=leak Eric Wong 2023-07-31 12:08:06 +00:00
  • d089a06421 bundle: use OPT_PASSTHRU_ARGV René Scharfe 2023-07-29 22:40:27 +02:00
  • ee48e70a82 The seventeenth batch Junio C Hamano 2023-07-28 09:17:53 -07:00
  • ddcb8fd8b9 Merge branch 'rs/pack-objects-parseopt-fix' Junio C Hamano 2023-07-28 09:45:22 -07:00
  • 3085f949bf Merge branch 'rs/describe-parseopt-fix' Junio C Hamano 2023-07-28 09:45:21 -07:00
  • c8a33b44c5 Merge branch 'bb/trace2-comment-fix' Junio C Hamano 2023-07-28 09:45:21 -07:00
  • 010447cf09 MyFirstContribution: refrain from self-iterating too much Junio C Hamano 2023-07-27 17:43:17 -07:00
  • c486f9e604 What's cooking (2023/07 #06) Junio C Hamano 2023-07-27 15:45:25 -07:00
  • bfce02c22f The sixteenth batch Junio C Hamano 2023-07-27 15:02:38 -07:00
  • e672bc4f76 Merge branch 'jc/parse-options-reset' Junio C Hamano 2023-07-27 15:26:37 -07:00
  • d6966f6fff Merge branch 'jc/parse-options-show-branch' Junio C Hamano 2023-07-27 15:26:37 -07:00
  • 9562f19026 Merge branch 'jc/transport-parseopt-fix' Junio C Hamano 2023-07-27 15:26:37 -07:00
  • 7fb1483c27 Merge branch 'jc/gitignore-doc-pattern-markup' Junio C Hamano 2023-07-27 15:26:36 -07:00
  • 369998df83 SubmittingPatches: use of older maintenance tracks is an exception Junio C Hamano 2023-07-25 22:21:12 -07:00
  • f835de52d7 SubmittingPatches: explain why 'next' and above are inappropriate base Junio C Hamano 2023-07-25 22:17:31 -07:00
  • d1b72cb364 t2400: rewrite regex to avoid unintentional PCRE Jacob Abel 2023-07-26 21:42:34 +00:00
  • 7e42d4bf15 builtin/worktree.c: convert tab in advice to space Jacob Abel 2023-07-26 21:42:24 +00:00
  • 9111ea1cbe t2400: drop no-op --sq from rev-parse call Jacob Abel 2023-07-26 21:42:18 +00:00
  • b4fce4b6e4 The fifteenth batch Junio C Hamano 2023-07-26 13:40:42 -07:00
  • 9a5e3b5f47 Merge branch 'jc/branch-parseopt-fix' Junio C Hamano 2023-07-26 14:13:15 -07:00
  • 914a353a12 Merge branch 'jc/am-parseopt-fix' Junio C Hamano 2023-07-26 14:13:15 -07:00
  • 8ae477e2b4 Merge branch 'rs/ls-tree-no-full-name-fix' Junio C Hamano 2023-07-26 14:13:15 -07:00
  • 89672f14d5 Merge branch 'jr/gitignore-doc-example-markup' Junio C Hamano 2023-07-26 14:13:15 -07:00
  • cb626f8e5c credential/wincred: erase matching creds only M Hickford 2023-07-26 19:51:22 +00:00
  • 7144dee3ec credential/libsecret: erase matching creds only M Hickford 2023-07-26 19:46:54 +00:00
  • 37f6040764 SubmittingPatches: choice of base for fixing an older maintenance track Junio C Hamano 2023-07-25 22:16:49 -07:00
  • 7cebc5bd78 doc: highlight that .gitmodules does not support !command Petar Vutov 2023-07-25 23:22:18 +02:00
  • cdae53671e What's cooking (2023/07 #05) Junio C Hamano 2023-07-25 12:38:40 -07:00
  • a80be15292 The fourteenth batch Junio C Hamano 2023-07-25 12:05:40 -07:00
  • 5929e66755 Merge branch 'jk/nested-points-at' Junio C Hamano 2023-07-25 12:05:24 -07:00
  • 02f50d0d19 Merge branch 'rs/strbuf-addftime-simplify' Junio C Hamano 2023-07-25 12:05:24 -07:00
  • 261ff512e1 Merge branch 'rs/ref-filter-signature-fix' Junio C Hamano 2023-07-25 12:05:24 -07:00
  • c5fcd34e1b Merge branch 'jk/unused-parameter' Junio C Hamano 2023-07-25 12:05:24 -07:00
  • dd224ce15d Merge branch 'dk/bundle-i18n-more' Junio C Hamano 2023-07-25 12:05:24 -07:00
  • 0e30958044 Merge branch 'mh/mingw-case-sensitive-build' Junio C Hamano 2023-07-25 12:05:23 -07:00
  • d4ce18536a Merge branch 'dk/t4002-syntaxo-fix' Junio C Hamano 2023-07-25 12:05:23 -07:00
  • 4488bb3bed Merge branch 'tb/object-access-overflow-protection' Junio C Hamano 2023-07-25 12:05:23 -07:00
  • 88d08c342a Merge branch 'ah/advise-force-pushing' Junio C Hamano 2023-07-25 12:05:23 -07:00
  • 08e5fb1296 hex: retire get_sha1_hex() Junio C Hamano 2023-07-24 16:11:03 -07:00
  • f1b9cebc8b t/lib-commit-graph.sh: avoid sub-shell in graph_git_behavior() Taylor Blau 2023-07-24 12:39:34 -04:00
  • 749f126b29 t5328: avoid top-level directory changes Taylor Blau 2023-07-24 12:39:31 -04:00
  • 51550d03e4 t5318: avoid top-level directory changes Taylor Blau 2023-07-24 12:39:28 -04:00